Changeset 200042 in webkit

Timestamp:

Apr 25, 2016, 1:06:04 PM (9 years ago)

Author:

Simon Fraser

Message:

Negative animation-delay is treated as 0s
​https://bugs.webkit.org/show_bug.cgi?id=141008

Reviewed by Daniel Bates.

Source/WebCore:

Fix keyframe animations which start in the paused state.

Explicitly move such animations from the new to the paused state, and
set m_pauseTime to 0, rather than leaving it at -1. Fix getElapsedTime()
to compute a correct time elapsed time for such animations, which takes
negative delay into account correctly.

Fix assertions which need to account for the new transition of New -> PlayStatePaused.

Test: animations/play-state-start-paused.html

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::updateStateMachine):
(WebCore::AnimationBase::getElapsedTime):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::animate):

LayoutTests:

Ref test that has an initially-paused animation on 'left' and with a
3d transform.

• animations/play-state-start-paused-expected.html: Added.
• animations/play-state-start-paused.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/play-state-start-paused-expected.html (added)
• LayoutTests/animations/play-state-start-paused.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/AnimationBase.cpp (modified) (6 diffs)
• Source/WebCore/page/animation/KeyframeAnimation.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-25  Simon Fraser  <simon.fraser@apple.com>
+
+        Negative animation-delay is treated as 0s
+        https://bugs.webkit.org/show_bug.cgi?id=141008
+
+        Reviewed by Daniel Bates.
+        
+        Ref test that has an initially-paused animation on 'left' and with a
+        3d transform.
+
+        * animations/play-state-start-paused-expected.html: Added.
+        * animations/play-state-start-paused.html: Added.
+
 2016-04-25  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-25  Simon Fraser  <simon.fraser@apple.com>
+
+        Negative animation-delay is treated as 0s
+        https://bugs.webkit.org/show_bug.cgi?id=141008
+
+        Reviewed by Daniel Bates.
+        
+        Fix keyframe animations which start in the paused state.
+        
+        Explicitly move such animations from the new to the paused state, and
+        set m_pauseTime to 0, rather than leaving it at -1. Fix getElapsedTime()
+        to compute a correct time elapsed time for such animations, which takes
+        negative delay into account correctly.
+        
+        Fix assertions which need to account for the new transition of New -> PlayStatePaused.
+
+        Test: animations/play-state-start-paused.html
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::updateStateMachine):
+        (WebCore::AnimationBase::getElapsedTime):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::animate):
+
 2016-04-25  Antti Koivisto  <antti@apple.com>
 

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

@@ -220 +220 @@
                 LOG(Animations, "%p AnimationState %s -> AnimationState::PausedNew", this, nameForState(m_animationState));
                 m_animationState = AnimationState::PausedNew;
+                m_pauseTime = 0;
             }
 
@@ -389 +390 @@
             // 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::PlayStateRunning || input == AnimationStateInput::StartTimeSet || input == AnimationStateInput::StyleAvailable || input == AnimationStateInput::StartAnimation);
+            ASSERT(input == AnimationStateInput::PlayStatePaused || input == AnimationStateInput::PlayStateRunning || input == AnimationStateInput::StartTimeSet || input == AnimationStateInput::StyleAvailable || input == AnimationStateInput::StartAnimation);
             ASSERT(paused());
 
@@ -398 +399 @@
                     LOG(Animations, "%p AnimationState %s -> AnimationState::New", this, nameForState(m_animationState));
                     m_animationState = AnimationState::New;
+                    m_pauseTime = -1;
                     updateStateMachine(input, param);
                     break;
@@ -407 +409 @@
                 else
                     m_startTime = 0;
+
                 m_pauseTime = -1;
 
@@ -447 +450 @@
             }
 
-            ASSERT(m_animationState == AnimationState::PausedWaitStyleAvailable);
+            ASSERT(m_animationState == AnimationState::PausedNew || m_animationState == AnimationState::PausedWaitStyleAvailable);
             // We are paused but we got the callback that notifies us that style has been updated.
             // We move to the AnimationState::PausedWaitResponse state
@@ -742 +745 @@
 #endif
 
-    if (paused())
-        return m_pauseTime - m_startTime;
+    if (paused()) {
+        double delayOffset = (!m_startTime && m_animation->delay() < 0) ? m_animation->delay() : 0;
+        return m_pauseTime - m_startTime - delayOffset;
+    }
+
     if (m_startTime <= 0)
         return 0;
+
     if (postActive() || fillingForwards())
         return m_totalDuration;

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

@@ -132 +132 @@
     
     // If we have not yet started, we will not have a valid start time, so just start the animation if needed.
-    if (isNew() && m_animation->playState() == AnimPlayStatePlaying && !compositeAnimation->isSuspended())
-        updateStateMachine(AnimationStateInput::StartAnimation, -1);
+    if (isNew()) {
+        if (m_animation->playState() == AnimPlayStatePlaying && !compositeAnimation->isSuspended())
+            updateStateMachine(AnimationStateInput::StartAnimation, -1);
+        else if (m_animation->playState() == AnimPlayStatePaused)
+            updateStateMachine(AnimationStateInput::PlayStatePaused, -1);
+    }
 
     // If we get this far and the animation is done, it means we are cleaning up a just finished animation.