Changeset 289167 in webkit

Timestamp:

Feb 6, 2022 7:17:32 AM (5 months ago)

Author:

graouts@webkit.org

Message:

[css-logical] [css-transitions] Resolve logic properties when compiling the list of transition properties
​https://bugs.webkit.org/show_bug.cgi?id=236197

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Mark WPT progressions.

• web-platform-tests/css/css-logical/animation-004-expected.txt:

Source/WebCore:

In r289161 we added initial support for transitions of logical properties. However, we would resolve the
transition-property in updateCSSTransitionsForStyleableAndProperty() whereas we should resolve them earlier
when compiling the list of transition-property values found in the previous style and the new style.

• style/Styleable.cpp:

(WebCore::keyframeEffectForElementAndProperty):
(WebCore::compileTransitionPropertiesInStyle):
(WebCore::updateCSSTransitionsForStyleableAndProperty):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-logical/animation-004-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/Styleable.cpp (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-06  Antoine Quint  <graouts@webkit.org>
+
+        [css-logical] [css-transitions] Resolve logic properties when compiling the list of transition properties
+        https://bugs.webkit.org/show_bug.cgi?id=236197
+
+        Reviewed by Dean Jackson.
+
+        Mark WPT progressions.
+
+        * web-platform-tests/css/css-logical/animation-004-expected.txt:
+
 2022-02-05  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-logical/animation-004-expected.txt

@@ -8 +8 @@
 PASS Physical properties and logical properties can be mixed
 PASS Declaration order is respected on each keyframe individually
-FAIL Transitions update when the writing-mode is changed assert_equals: expected "0px" but got "50px"
+PASS Transitions update when the writing-mode is changed
 PASS Filling transitions update when the writing-mode is changed
-FAIL The number of interpolating properties can be increased when the writing-mode is changed assert_equals: expected "0px" but got "50px"
-FAIL The number of interpolating properties can be decreased when the writing-mode is changed assert_equals: expected "300px" but got "275px"
+PASS The number of interpolating properties can be increased when the writing-mode is changed
+PASS The number of interpolating properties can be decreased when the writing-mode is changed
 FAIL Transitions update when the writing-mode is changed through a CSS variable assert_equals: expected "50px" but got "0px"
-FAIL Transitions update when the direction is changed assert_equals: expected "0px" but got "50px"
-FAIL Transitions from logical to physical update when the direction is changed assert_equals: expected "0px" but got "50px"
-FAIL Transitions from physical to logical update when the direction is changed assert_equals: expected "0px" but got "50px"
+PASS Transitions update when the direction is changed
+PASS Transitions from logical to physical update when the direction is changed
+PASS Transitions from physical to logical update when the direction is changed
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-06  Antoine Quint  <graouts@webkit.org>
+
+        [css-logical] [css-transitions] Resolve logic properties when compiling the list of transition properties
+        https://bugs.webkit.org/show_bug.cgi?id=236197
+
+        Reviewed by Dean Jackson.
+
+        In r289161 we added initial support for transitions of logical properties. However, we would resolve the
+        transition-property in updateCSSTransitionsForStyleableAndProperty() whereas we should resolve them earlier
+        when compiling the list of transition-property values found in the previous style and the new style.
+
+        * style/Styleable.cpp:
+        (WebCore::keyframeEffectForElementAndProperty):
+        (WebCore::compileTransitionPropertiesInStyle):
+        (WebCore::updateCSSTransitionsForStyleableAndProperty):
+
 2022-02-03  Nikolas Zimmermann  <nzimmermann@igalia.com>
 

trunk/Source/WebCore/style/Styleable.cpp

@@ -322 +322 @@
 }
 
-static KeyframeEffect* keyframeEffectForElementAndProperty(const Styleable& styleable, CSSPropertyID resolvedProperty, CSSPropertyID unresolvedProperty)
+static KeyframeEffect* keyframeEffectForElementAndProperty(const Styleable& styleable, CSSPropertyID property)
 {
     if (auto* keyframeEffectStack = styleable.keyframeEffectStack()) {
         auto effects = keyframeEffectStack->sortedEffects();
         for (const auto& effect : makeReversedRange(effects)) {
-            if (effect->animatesProperty(resolvedProperty) || (resolvedProperty != unresolvedProperty && effect->animatesProperty(unresolvedProperty)))
+            if (effect->animatesProperty(property))
                 return effect.get();
         }
@@ -382 +382 @@
         auto mode = animation->property().mode;
         if (mode == Animation::TransitionMode::SingleProperty) {
-            auto property = animation->property().id;
+            auto property = CSSProperty::resolveDirectionAwareProperty(animation->property().id, style.direction(), style.writingMode());
             if (isShorthandCSSProperty(property)) {
                 for (auto longhand : shorthandForProperty(property))
@@ -397 +397 @@
 static void updateCSSTransitionsForStyleableAndProperty(const Styleable& styleable, CSSPropertyID property, const RenderStyle& currentStyle, const RenderStyle& newStyle, const MonotonicTime generationTime)
 {
-    auto unresolvedProperty = property;
-    property = CSSProperty::resolveDirectionAwareProperty(property, newStyle.direction(), newStyle.writingMode());
-
-    auto* keyframeEffect = keyframeEffectForElementAndProperty(styleable, property, unresolvedProperty);
+    auto* keyframeEffect = keyframeEffectForElementAndProperty(styleable, property);
     auto* animation = keyframeEffect ? keyframeEffect->animation() : nullptr;