Changeset 231794 in webkit

Timestamp:

May 15, 2018, 1:59:53 AM (7 years ago)

Author:

Antti Koivisto

Message:

animation-play-state: paused causes very high cpu load because of style invalidation loop
​https://bugs.webkit.org/show_bug.cgi?id=182436
<rdar://problem/37182562>

Reviewed by Dean Jackson.

Source/WebCore:

Test: animations/animation-playstate-paused-style-resolution.html

If the style of an element with 'animation-play-state: paused' is recomputed so it stays
paused we would enter zero-duration animation timer loop.

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::updateStateMachine):

Don't move to AnimationState::PausedWaitResponse unless we get AnimationStateInput::StyleAvailable
(matching the comments). Otherwise just stay in the existing paused state.

Remove AnimationStateInput::StartAnimation from assertion as the case can't happen.

LayoutTests:

• animations/animation-playstate-paused-style-resolution-expected.txt: Added.
• animations/animation-playstate-paused-style-resolution.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/animation-playstate-paused-style-resolution-expected.txt (added)
• LayoutTests/animations/animation-playstate-paused-style-resolution.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/AnimationBase.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-05-15  Antti Koivisto  <[email protected]>
+
+        animation-play-state: paused causes very high cpu load because of style invalidation loop
+        https://bugs.webkit.org/show_bug.cgi?id=182436
+        <rdar://problem/37182562>
+
+        Reviewed by Dean Jackson.
+
+        * animations/animation-playstate-paused-style-resolution-expected.txt: Added.
+        * animations/animation-playstate-paused-style-resolution.html: Added.
+
 2018-05-14  Youenn Fablet  <[email protected]>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-15  Antti Koivisto  <[email protected]>
+
+        animation-play-state: paused causes very high cpu load because of style invalidation loop
+        https://bugs.webkit.org/show_bug.cgi?id=182436
+        <rdar://problem/37182562>
+
+        Reviewed by Dean Jackson.
+
+        Test: animations/animation-playstate-paused-style-resolution.html
+
+        If the style of an element with 'animation-play-state: paused' is recomputed so it stays
+        paused we would enter zero-duration animation timer loop.
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::updateStateMachine):
+
+        Don't move to AnimationState::PausedWaitResponse unless we get AnimationStateInput::StyleAvailable
+        (matching the comments). Otherwise just stay in the existing paused state.
+
+        Remove AnimationStateInput::StartAnimation from assertion as the case can't happen.
+
 2018-05-14  Youenn Fablet  <[email protected]>
 

trunk/Source/WebCore/page/animation/AnimationBase.cpp

@@ -396 +396 @@
             // When the AnimationStateInput::StartTimeSet comes in and we were in AnimationState::PausedRun, we will notice
             // that we have already set the startTime and will ignore it.
-            ASSERT(input == AnimationStateInput::PlayStatePaused || input == AnimationStateInput::PlayStateRunning || input == AnimationStateInput::StartTimeSet || input == AnimationStateInput::StyleAvailable || input == AnimationStateInput::StartAnimation);
+            ASSERT(input == AnimationStateInput::PlayStatePaused || input == AnimationStateInput::PlayStateRunning || input == AnimationStateInput::StartTimeSet || input == AnimationStateInput::StyleAvailable);
             ASSERT(paused());
 
@@ -457 +457 @@
 
             ASSERT(m_animationState == AnimationState::PausedNew || m_animationState == AnimationState::PausedWaitStyleAvailable);
+
+            if (input == AnimationStateInput::PlayStatePaused)
+                break;
+
+            ASSERT(input == AnimationStateInput::StyleAvailable);
+
             // We are paused but we got the callback that notifies us that style has been updated.
             // We move to the AnimationState::PausedWaitResponse state