Web Animations: Remove timeLag from Player API and model

Source/core/animation/AnimationPlayerTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
     TrackExceptionState exceptionState;
 };
 
 TEST_F(AnimationAnimationPlayerTest, InitialState)
 {
     setUpWithoutStartingTimeline();
     player = timeline->createAnimationPlayer(0);
     EXPECT_EQ(0, player->currentTimeInternal());
     EXPECT_FALSE(player->paused());
     EXPECT_EQ(1, player->playbackRate());
-    EXPECT_EQ(0, player->timeLagInternal());
     EXPECT_FALSE(player->hasStartTime());
     EXPECT_TRUE(isNull(player->startTimeInternal()));
 
     startTimeline();
     player->setStartTimeInternal(0);
     EXPECT_EQ(0, timeline->currentTimeInternal());
     EXPECT_EQ(0, player->currentTimeInternal());
     EXPECT_FALSE(player->paused());
     EXPECT_EQ(1, player->playbackRate());
     EXPECT_EQ(0, player->startTimeInternal());
-    EXPECT_EQ(0, player->timeLagInternal());
     EXPECT_TRUE(player->hasStartTime());
 }
 
 
 TEST_F(AnimationAnimationPlayerTest, CurrentTimeDoesNotSetOutdated)
 {
     EXPECT_FALSE(player->outdated());
     EXPECT_EQ(0, player->currentTimeInternal());
     EXPECT_FALSE(player->outdated());
     // FIXME: We should split updateTimeline into a version that doesn't update
@@ skipping 64 matching lines @@
 {
     player->setCurrentTimeInternal(std::numeric_limits<double>::max());
     EXPECT_EQ(std::numeric_limits<double>::max(), player->currentTimeInternal());
     updateTimeline(100);
     EXPECT_EQ(std::numeric_limits<double>::max(), player->currentTimeInternal());
 }
 
 TEST_F(AnimationAnimationPlayerTest, SetCurrentTimeUnrestrictedDouble)
 {
     updateTimeline(10);
-    player->setCurrentTimeInternal(nullValue());
+    player->setCurrentTime(nullValue());
     EXPECT_EQ(10, player->currentTimeInternal());
-    player->setCurrentTimeInternal(std::numeric_limits<double>::infinity());
+    player->setCurrentTime(std::numeric_limits<double>::infinity());
     EXPECT_EQ(10, player->currentTimeInternal());
-    player->setCurrentTimeInternal(-std::numeric_limits<double>::infinity());
+    player->setCurrentTime(-std::numeric_limits<double>::infinity());
     EXPECT_EQ(10, player->currentTimeInternal());
 }
 
-TEST_F(AnimationAnimationPlayerTest, TimeLag)
+
+TEST_F(AnimationAnimationPlayerTest, SetCurrentTimeSetsStartTime)
 {
-    player->setCurrentTimeInternal(10);
-    EXPECT_EQ(-10, player->timeLagInternal());
-    updateTimeline(10);
-    EXPECT_EQ(-10, player->timeLagInternal());
-    player->setCurrentTimeInternal(40);
-    EXPECT_EQ(-30, player->timeLagInternal());
-    updateTimeline(20);
-    EXPECT_EQ(-20, player->timeLagInternal());
+    EXPECT_EQ(0, player->startTime());
+    player->setCurrentTime(1000);
+    EXPECT_EQ(-1000, player->startTime());
+    updateTimeline(1);
+    EXPECT_EQ(-1000, player->startTime());
+    EXPECT_EQ(2000, player->currentTime());
 }
 
-
 TEST_F(AnimationAnimationPlayerTest, SetStartTime)
 {
     updateTimeline(20);
     EXPECT_EQ(0, player->startTimeInternal());
     EXPECT_EQ(20, player->currentTimeInternal());
     player->setStartTimeInternal(10);
     EXPECT_EQ(10, player->startTimeInternal());
     EXPECT_EQ(10, player->currentTimeInternal());
     updateTimeline(30);
     EXPECT_EQ(10, player->startTimeInternal());
@@ skipping 14 matching lines @@
 {
     updateTimeline(30);
     player->setStartTimeInternal(-10);
     EXPECT_EQ(30, player->currentTimeInternal());
     player->setCurrentTimeInternal(50);
     player->setStartTimeInternal(-40);
     EXPECT_EQ(50, player->currentTimeInternal());
     EXPECT_TRUE(player->finished());
 }
 
+TEST_F(AnimationAnimationPlayerTest, StartTimePauseFinish)
+{
+    player->pause();
+    EXPECT_TRUE(std::isnan(player->startTime()));
+    player->finish(exceptionState);
+    EXPECT_TRUE(std::isnan(player->startTime()));
+}
+
+TEST_F(AnimationAnimationPlayerTest, StartTimeFinishPause)
+{
+    double startTime = player->startTime();
+    player->finish(exceptionState);
+    EXPECT_EQ(startTime, player->startTime());
+    player->pause();
+    EXPECT_TRUE(std::isnan(player->startTime()));
+}
+
+TEST_F(AnimationAnimationPlayerTest, StartTimeWithZeroPlaybackRate)
+{
+    player->setPlaybackRate(0);
+    EXPECT_TRUE(std::isnan(player->startTime()));
+}
+
 TEST_F(AnimationAnimationPlayerTest, SetStartTimeWhilePaused)
 {
     updateTimeline(10);
     player->pause();
     player->setStartTimeInternal(-40);
     EXPECT_EQ(10, player->currentTimeInternal());
     updateTimeline(50);
     player->setStartTimeInternal(60);
     EXPECT_EQ(10, player->currentTimeInternal());
 }
 
-
 TEST_F(AnimationAnimationPlayerTest, PausePlay)
 {
     updateTimeline(10);
     player->pause();
     EXPECT_TRUE(player->paused());
     EXPECT_EQ(10, player->currentTimeInternal());
     updateTimeline(20);
     player->play();
     EXPECT_FALSE(player->paused());
     EXPECT_EQ(10, player->currentTimeInternal());
@@ skipping 437 matching lines @@
 }
 
 TEST_F(AnimationAnimationPlayerTest, HasLowerPriority)
 {
     RefPtrWillBeRawPtr<AnimationPlayer> player1 = timeline->createAnimationPlayer(0);
     RefPtrWillBeRawPtr<AnimationPlayer> player2 = timeline->createAnimationPlayer(0);
     EXPECT_TRUE(AnimationPlayer::hasLowerPriority(player1.get(), player2.get()));
 }
 
 }