Changeset 289453 in webkit

Timestamp:

Feb 8, 2022 10:22:01 PM (5 months ago)

Author:

graouts@webkit.org

Message:

[web-animations] Animation.commitStyles() should use the non-animated style
​https://bugs.webkit.org/show_bug.cgi?id=236315

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Mark WPT progression.

• web-platform-tests/web-animations/interfaces/Animation/commitStyles-expected.txt:

Source/WebCore:

• animation/WebAnimation.cpp:

(WebCore::WebAnimation::commitStyles):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/interfaces/Animation/commitStyles-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/WebAnimation.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-08  Antoine Quint  <graouts@webkit.org>
+
+        [web-animations] Animation.commitStyles() should use the non-animated style
+        https://bugs.webkit.org/show_bug.cgi?id=236315
+
+        Reviewed by Dean Jackson.
+
+        Mark WPT progression.
+
+        * web-platform-tests/web-animations/interfaces/Animation/commitStyles-expected.txt:
+
 2022-02-08  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/interfaces/Animation/commitStyles-expected.txt

@@ -15 +15 @@
 PASS Commits "none" transform
 PASS Commits the intermediate value of an animation in the middle of stack
-FAIL Commit composites on top of the underlying value assert_approx_equals: expected 0.5 +/- 0.0001 but got 1
+PASS Commit composites on top of the underlying value
 PASS Triggers mutation observers when updating style
 FAIL Does NOT trigger mutation observers when the change to style is redundant assert_equals: Should have no mutation records expected 0 but got 1

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-08  Antoine Quint  <graouts@webkit.org>
+
+        [web-animations] Animation.commitStyles() should use the non-animated style
+        https://bugs.webkit.org/show_bug.cgi?id=236315
+
+        Reviewed by Dean Jackson.
+
+        * animation/WebAnimation.cpp:
+        (WebCore::WebAnimation::commitStyles):
+
 2022-02-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/animation/WebAnimation.cpp

@@ -1452 +1452 @@
     // animation whose effect target is target.
 
-    auto& style = renderer->style();
+    auto unanimatedStyle = [&]() {
+        if (auto styleable = Styleable::fromRenderer(*renderer)) {
+            if (auto* lastStyleChangeEventStyle = styleable->lastStyleChangeEventStyle())
+                return RenderStyle::clone(*lastStyleChangeEventStyle);
+        }
+        // If we don't have a style for the last style change event, then the
+        // current renderer style cannot be animated.
+        return RenderStyle::clone(renderer->style());
+    }();
+
     auto computedStyleExtractor = ComputedStyleExtractor(&styledElement);
     auto inlineStyle = styledElement.document().createCSSStyleDeclaration();
@@ -1472 +1481 @@
         // We actually perform those steps in a different way: instead of building a copy of the effect stack and then removing stuff, we iterate through the
         // effect stack and stop when we've found this animation's effect or when we've found an effect associated with an animation with a higher composite order.
-        auto animatedStyle = RenderStyle::clonePtr(style);
+        auto animatedStyle = RenderStyle::clonePtr(unanimatedStyle);
         for (const auto& effectInStack : keyframeStack.sortedEffects()) {
             if (effectInStack->animation() != this && !compareAnimationsByCompositeOrder(*effectInStack->animation(), *this))