Changeset 289426 in webkit

Timestamp:

Feb 8, 2022 2:06:14 PM (5 months ago)

Author:

graouts@webkit.org

Message:

[css-logical] [css-animations] changing "direction" or "writing-mode" should recompute keyframes
​https://bugs.webkit.org/show_bug.cgi?id=236293

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Mark WPT progressions.

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

Source/WebCore:

We need to recompute keyframes based on the matching @keyframes rule in case an element running
a CSS Animation changes either "direction" or "writing-mode".

• animation/KeyframeEffect.cpp:

(WebCore::KeyframeEffect::propertyAffectingLogicalPropertiesDidChange):

• animation/KeyframeEffect.h:
• animation/KeyframeEffectStack.cpp:

(WebCore::KeyframeEffectStack::applyKeyframeEffects):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-logical/animation-002-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.cpp (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.h (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffectStack.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-08  Antoine Quint  <graouts@webkit.org>
+
+        [css-logical] [css-animations] changing "direction" or "writing-mode" should recompute keyframes
+        https://bugs.webkit.org/show_bug.cgi?id=236293
+
+        Reviewed by Dean Jackson.
+
+        Mark WPT progressions.
+
+        * web-platform-tests/css/css-logical/animation-002-expected.txt:
+
 2022-02-08  Chris Dumez  <cdumez@apple.com>
 

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

@@ -8 +8 @@
 PASS Physical properties and logical properties can be mixed
 PASS Declaration order is respected on each keyframe individually
-FAIL Animations update when the writing-mode is changed assert_equals: expected "50px" but got "0px"
-FAIL Filling animations update when the writing-mode is changed assert_equals: expected "100px" but got "0px"
-FAIL The number of interpolating properties can be increased when the writing-mode is changed assert_equals: expected "50px" but got "0px"
-FAIL The number of interpolating properties can be decreased when the writing-mode is changed assert_equals: expected "150px" but got "200px"
-FAIL Animations update when the writing-mode is changed through a CSS variable assert_equals: expected "50px" but got "0px"
+PASS Animations update when the writing-mode is changed
+PASS Filling animations update when the writing-mode is changed
+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
+PASS Animations update when the writing-mode is changed through a CSS variable
 PASS Logical shorthand with variable references animates correctly
-FAIL Animations update when the direction is changed assert_equals: expected "0px" but got "50px"
+PASS Animations update when the direction is changed
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-08  Antoine Quint  <graouts@webkit.org>
+
+        [css-logical] [css-animations] changing "direction" or "writing-mode" should recompute keyframes
+        https://bugs.webkit.org/show_bug.cgi?id=236293
+
+        Reviewed by Dean Jackson.
+
+        We need to recompute keyframes based on the matching @keyframes rule in case an element running
+        a CSS Animation changes either "direction" or "writing-mode".
+
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::propertyAffectingLogicalPropertiesDidChange):
+        * animation/KeyframeEffect.h:
+        * animation/KeyframeEffectStack.cpp:
+        (WebCore::KeyframeEffectStack::applyKeyframeEffects):
+
 2022-02-08  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/animation/KeyframeEffect.cpp

@@ -1702 +1702 @@
 }
 
-void KeyframeEffect::propertyAffectingLogicalPropertiesDidChange()
-{
-    if (m_blendingKeyframesSource == BlendingKeyframesSource::WebAnimation)
+void KeyframeEffect::propertyAffectingLogicalPropertiesDidChange(RenderStyle& unanimatedStyle, const Style::ResolutionContext& resolutionContext)
+{
+    switch (m_blendingKeyframesSource) {
+    case BlendingKeyframesSource::CSSTransition:
+        return;
+    case BlendingKeyframesSource::CSSAnimation:
+        computeCSSAnimationBlendingKeyframes(unanimatedStyle, resolutionContext);
+        return;
+    case BlendingKeyframesSource::WebAnimation:
         clearBlendingKeyframes();
+        return;
+    }
 }
 

trunk/Source/WebCore/animation/KeyframeEffect.h

@@ -127 +127 @@
     void animationTimingDidChange();
     void transformRelatedPropertyDidChange();
-    void propertyAffectingLogicalPropertiesDidChange();
+    void propertyAffectingLogicalPropertiesDidChange(RenderStyle&, const Style::ResolutionContext&);
     OptionSet<AcceleratedActionApplicationResult> applyPendingAcceleratedActions();
 

trunk/Source/WebCore/animation/KeyframeEffectStack.cpp

@@ -137 +137 @@
         || previousLastStyleChangeEventStyle.writingMode() != targetStyle.writingMode();
 
+    auto unanimatedStyle = RenderStyle::clone(targetStyle);
+
     for (const auto& effect : sortedEffects()) {
         ASSERT(effect->animation());
 
         if (propertyAffectingLogicalPropertiesChanged)
-            effect->propertyAffectingLogicalPropertiesDidChange();
+            effect->propertyAffectingLogicalPropertiesDidChange(unanimatedStyle, resolutionContext);
 
         effect->animation()->resolve(targetStyle, resolutionContext);