Web Animations: Add tests for player state transitions and fix discovered issues

BUG=396372,410229

Review URL: https://codereview.chromium.org/555063002

git-svn-id: svn://svn.chromium.org/blink/trunk@181716 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/animation/AnimationPlayer.cpp

@@ -307,19 +307,13 @@ void AnimationPlayer::setCurrentTime(double newCurrentTime)
         return;
 
     setCompositorPending();
-
-    // Setting current time while pending forces a start time.
-    if (m_currentTimePending) {
-        m_startTime = 0;
-        m_currentTimePending = false;
-    }
-
+    m_currentTimePending = false;
     setCurrentTimeInternal(newCurrentTime / 1000, TimingUpdateOnDemand);
 }
 
 void AnimationPlayer::setStartTime(double startTime)
 {
-    if (m_paused) // FIXME: Should this throw an exception?
+    if (m_paused || m_idle)
         return;
     if (!std::isfinite(startTime))
         return;
@@ -472,23 +466,13 @@ void AnimationPlayer::reverse()
     }
 
     uncancel();
-
-    if (m_content) {
-        if (m_playbackRate > 0 && currentTimeInternal() > sourceEnd()) {
-            setCurrentTimeInternal(sourceEnd(), TimingUpdateOnDemand);
-            ASSERT(finished());
-        } else if (m_playbackRate < 0 && currentTimeInternal() < 0) {
-            setCurrentTimeInternal(0, TimingUpdateOnDemand);
-            ASSERT(finished());
-        }
-    }
     setPlaybackRate(-m_playbackRate);
-    unpauseInternal();
+    play();
 }
 
 void AnimationPlayer::finish(ExceptionState& exceptionState)
 {
-    if (!m_playbackRate) {
+    if (!m_playbackRate || m_idle) {
         return;
     }
     if (m_playbackRate > 0 && sourceEnd() == std::numeric_limits<double>::infinity()) {
@@ -500,13 +484,14 @@ void AnimationPlayer::finish(ExceptionState& exceptionState)
     }
 
     uncancel();
-    m_startTime = 0;
 
-    if (m_playbackRate < 0) {
-        setCurrentTimeInternal(0, TimingUpdateOnDemand);
-    } else {
-        setCurrentTimeInternal(sourceEnd(), TimingUpdateOnDemand);
+    double newCurrentTime = m_playbackRate < 0 ? 0 : sourceEnd();
+    setCurrentTimeInternal(newCurrentTime, TimingUpdateOnDemand);
+    if (!paused()) {
+        m_startTime = calculateStartTime(newCurrentTime);
     }
+
+    m_currentTimePending = false;
     ASSERT(finished());
 }
 
@@ -546,7 +531,7 @@ void AnimationPlayer::setPlaybackRate(double playbackRate)
         return;
 
     setCompositorPending();
-    if (!finished() && !paused())
+    if (!finished() && !paused() && hasStartTime())
         m_currentTimePending = true;
 
     double storedCurrentTime = currentTimeInternal();
@@ -663,6 +648,7 @@ void AnimationPlayer::cancel()
     m_held = true;
     m_idle = true;
     m_startTime = nullValue();
+    m_currentTimePending = false;
     setCompositorPending();
 }
 

third_party/WebKit/Source/core/animation/AnimationPlayerTest.cpp

@@ -284,7 +284,7 @@ TEST_F(AnimationAnimationPlayerTest, StartTimePauseFinish)
     EXPECT_EQ(AnimationPlayer::Pending, player->playStateInternal());
     EXPECT_TRUE(std::isnan(player->startTime()));
     player->finish(exceptionState);
-    EXPECT_EQ(AnimationPlayer::Pending, player->playStateInternal());
+    EXPECT_EQ(AnimationPlayer::Paused, player->playStateInternal());
     EXPECT_TRUE(std::isnan(player->startTime()));
 }
 
@@ -300,9 +300,8 @@ TEST_F(AnimationAnimationPlayerTest, PauseBeatsFinish)
 
 TEST_F(AnimationAnimationPlayerTest, StartTimeFinishPause)
 {
-    double startTime = player->startTime();
     player->finish(exceptionState);
-    EXPECT_EQ(startTime, player->startTime());
+    EXPECT_EQ(-30 * 1000, player->startTime());
     player->pause();
     EXPECT_TRUE(std::isnan(player->startTime()));
 }
@@ -461,18 +460,18 @@ TEST_F(AnimationAnimationPlayerTest, ReverseSeeksToEnd)
     EXPECT_EQ(30, player->currentTimeInternal());
 }
 
-TEST_F(AnimationAnimationPlayerTest, ReverseLimitsAnimationPlayer)
+TEST_F(AnimationAnimationPlayerTest, ReverseBeyondLimit)
 {
     player->setCurrentTimeInternal(40);
     player->setPlaybackRate(-1);
     player->reverse();
-    EXPECT_TRUE(player->finished());
-    EXPECT_EQ(40, player->currentTimeInternal());
+    EXPECT_EQ(AnimationPlayer::Pending, player->playStateInternal());
+    EXPECT_EQ(0, player->currentTimeInternal());
 
     player->setCurrentTimeInternal(-10);
     player->reverse();
-    EXPECT_TRUE(player->finished());
-    EXPECT_EQ(-10, player->currentTimeInternal());
+    EXPECT_EQ(AnimationPlayer::Pending, player->playStateInternal());
+    EXPECT_EQ(30, player->currentTimeInternal());
 }
 
 
@@ -849,8 +848,6 @@ TEST_F(AnimationAnimationPlayerTest, PlayBackwardsAfterCancel)
     EXPECT_EQ(40 * 1000, player->startTime());
 }
 
-// FIXME: crbug.com/410229, when fixed, will reuqire the expected results of
-// this test to change (currentTime -> 30 * 1000).
 TEST_F(AnimationAnimationPlayerTest, ReverseAfterCancel)
 {
     player->cancel();
@@ -859,12 +856,12 @@ TEST_F(AnimationAnimationPlayerTest, ReverseAfterCancel)
     EXPECT_TRUE(std::isnan(player->startTime()));
     player->reverse();
     EXPECT_EQ(AnimationPlayer::Pending, player->playStateInternal());
-    EXPECT_TRUE(std::isnan(player->currentTime()));
+    EXPECT_EQ(30 * 1000, player->currentTime());
     EXPECT_TRUE(std::isnan(player->startTime()));
     simulateFrame(10);
-    EXPECT_EQ(AnimationPlayer::Finished, player->playStateInternal());
-    EXPECT_EQ(0 * 1000, player->currentTime());
-    EXPECT_EQ(10 * 1000, player->startTime());
+    EXPECT_EQ(AnimationPlayer::Running, player->playStateInternal());
+    EXPECT_EQ(30 * 1000, player->currentTime());
+    EXPECT_EQ(40 * 1000, player->startTime());
 }
 
 TEST_F(AnimationAnimationPlayerTest, FinishAfterCancel)
@@ -874,9 +871,9 @@ TEST_F(AnimationAnimationPlayerTest, FinishAfterCancel)
     EXPECT_TRUE(std::isnan(player->currentTime()));
     EXPECT_TRUE(std::isnan(player->startTime()));
     player->finish(exceptionState);
-    EXPECT_EQ(AnimationPlayer::Finished, player->playStateInternal());
-    EXPECT_EQ(30 * 1000, player->currentTime());
-    EXPECT_EQ(0, player->startTime());
+    EXPECT_TRUE(std::isnan(player->currentTime()));
+    EXPECT_TRUE(std::isnan(player->startTime()));
+    EXPECT_EQ(AnimationPlayer::Idle, player->playStateInternal());
 }
 
 TEST_F(AnimationAnimationPlayerTest, PauseAfterCancel)