Changeset 200347 in webkit

Timestamp:

May 2, 2016 4:47:33 PM (8 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r199964): Animation on pseudo elements doesn't trigger if first frame matches the current style
​https://bugs.webkit.org/show_bug.cgi?id=157284

Reviewed by Simon Fraser.

Source/WebCore:

r199964 accidentally changed the logic for computing style change for animations.

Test: fast/css/animation-pseudo-style-change.html

• style/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::updateBeforeOrAfterPseudoElement):

If there is an animated style determine the style change using it rather than the originally resolved style.

• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::resolveElement):

Here too.

LayoutTests:

• fast/css/animation-pseudo-style-change-expected.html: Added.
• fast/css/animation-pseudo-style-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/animation-pseudo-style-change-expected.html (added)
• LayoutTests/fast/css/animation-pseudo-style-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/RenderTreeUpdater.cpp (modified) (1 diff)
• Source/WebCore/style/StyleTreeResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-02  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r199964): Animation on pseudo elements doesn't trigger if first frame matches the current style
+        https://bugs.webkit.org/show_bug.cgi?id=157284
+
+        Reviewed by Simon Fraser.
+
+        * fast/css/animation-pseudo-style-change-expected.html: Added.
+        * fast/css/animation-pseudo-style-change.html: Added.
+
 2016-05-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-02  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r199964): Animation on pseudo elements doesn't trigger if first frame matches the current style
+        https://bugs.webkit.org/show_bug.cgi?id=157284
+
+        Reviewed by Simon Fraser.
+
+        r199964 accidentally changed the logic for computing style change for animations.
+
+        Test: fast/css/animation-pseudo-style-change.html
+
+        * style/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::updateBeforeOrAfterPseudoElement):
+
+            If there is an animated style determine the style change using it rather than the originally resolved style.
+
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolveElement):
+
+            Here too.
+
 2016-05-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/style/RenderTreeUpdater.cpp

@@ -489 +489 @@
         elementUpdate.isSynthetic = true;
 
-    elementUpdate.change = renderer ? Style::determineChange(renderer->style(), *newStyle) : Style::Detach;
     elementUpdate.style = animatedStyle ? WTFMove(animatedStyle) : WTFMove(newStyle);
+    elementUpdate.change = renderer ? Style::determineChange(renderer->style(), *elementUpdate.style) : Style::Detach;
 
     if (elementUpdate.change == Style::NoChange)

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -199 +199 @@
         update.isSynthetic = true;
 
-    update.change = needsNewRenderer ? Detach : determineChange(renderer->style(), *newStyle);
     update.style = animatedStyle ? WTFMove(animatedStyle) : WTFMove(newStyle);
+    update.change = needsNewRenderer ? Detach : determineChange(renderer->style(), *update.style);
 
     if (element.styleChangeType() == SyntheticStyleChange)