Revert of Web Animations: Use a single animation clock

third_party/WebKit/Source/core/animation/AnimationTest.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 20 matching lines @@
 #include "config.h"
 #include "core/animation/Animation.h"
 
 #include "core/animation/AnimationClock.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/QualifiedName.h"
-#include "core/testing/DummyPageHolder.h"
 #include "platform/weborigin/KURL.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class AnimationAnimationTest : public ::testing::Test {
 protected:
     void SetUp() override
     {
         setUpWithoutStartingTimeline();
         startTimeline();
     }
 
     void setUpWithoutStartingTimeline()
     {
-        pageHolder = DummyPageHolder::create();
-        document = &pageHolder->document();
+        document = Document::create();
         document->animationClock().resetTimeForTesting();
         timeline = AnimationTimeline::create(document.get());
         animation = timeline->play(0);
         animation->setStartTime(0);
         animation->setEffect(makeAnimation());
     }
 
     void startTimeline()
     {
         simulateFrame(0);
     }
 
     KeyframeEffect* makeAnimation(double duration = 30, double playbackRate = 1)
     {
         Timing timing;
         timing.iterationDuration = duration;
         timing.playbackRate = playbackRate;
         return KeyframeEffect::create(0, nullptr, timing);
     }
 
     bool simulateFrame(double time)
     {
-        document->animationClock().updateTime(document->timeline().zeroTime() + time);
+        document->animationClock().updateTime(time);
         document->compositorPendingAnimations().update(false);
         // The timeline does not know about our animation, so we have to explicitly call update().
         return animation->update(TimingUpdateForAnimationFrame);
     }
 
     RefPtrWillBePersistent<Document> document;
     Persistent<AnimationTimeline> timeline;
     Persistent<Animation> animation;
     TrackExceptionState exceptionState;
-    OwnPtr<DummyPageHolder> pageHolder;
 };
 
 TEST_F(AnimationAnimationTest, InitialState)
 {
     setUpWithoutStartingTimeline();
     animation = timeline->play(0);
     EXPECT_EQ(Animation::Pending, animation->playStateInternal());
     EXPECT_EQ(0, animation->currentTimeInternal());
     EXPECT_FALSE(animation->paused());
     EXPECT_EQ(1, animation->playbackRate());
@@ skipping 11 matching lines @@
 }
 
 TEST_F(AnimationAnimationTest, CurrentTimeDoesNotSetOutdated)
 {
     EXPECT_FALSE(animation->outdated());
     EXPECT_EQ(0, animation->currentTimeInternal());
     EXPECT_FALSE(animation->outdated());
     // FIXME: We should split simulateFrame into a version that doesn't update
     // the animation and one that does, as most of the tests don't require update()
     // to be called.
-    document->animationClock().updateTime(document->timeline().zeroTime() + 10);
+    document->animationClock().updateTime(10);
     EXPECT_EQ(10, animation->currentTimeInternal());
     EXPECT_FALSE(animation->outdated());
 }
 
 TEST_F(AnimationAnimationTest, SetCurrentTime)
 {
     EXPECT_EQ(Animation::Running, animation->playStateInternal());
     animation->setCurrentTimeInternal(10);
     EXPECT_EQ(Animation::Running, animation->playStateInternal());
     EXPECT_EQ(10, animation->currentTimeInternal());
@@ skipping 45 matching lines @@
     animation->setPlaybackRate(-2);
     animation->setCurrentTime(50 * 1000);
     EXPECT_EQ(Animation::Pending, animation->playStateInternal());
     EXPECT_EQ(50, animation->currentTimeInternal());
     simulateFrame(20);
     EXPECT_EQ(Animation::Running, animation->playStateInternal());
     simulateFrame(40);
     EXPECT_EQ(10, animation->currentTimeInternal());
 }
 
+TEST_F(AnimationAnimationTest, SetCurrentTimeBeforeTimelineStarted)
+{
+    setUpWithoutStartingTimeline();
+    animation->setCurrentTimeInternal(5);
+    EXPECT_EQ(5, animation->currentTimeInternal());
+    startTimeline();
+    simulateFrame(10);
+    EXPECT_EQ(15, animation->currentTimeInternal());
+}
+
+TEST_F(AnimationAnimationTest, SetCurrentTimePastContentEndBeforeTimelineStarted)
+{
+    setUpWithoutStartingTimeline();
+    animation->setCurrentTime(250 * 1000);
+    EXPECT_EQ(250, animation->currentTimeInternal());
+    startTimeline();
+    simulateFrame(10);
+    EXPECT_EQ(250, animation->currentTimeInternal());
+}
+
 TEST_F(AnimationAnimationTest, SetCurrentTimeMax)
 {
     animation->setCurrentTimeInternal(std::numeric_limits<double>::max());
     EXPECT_EQ(std::numeric_limits<double>::max(), animation->currentTimeInternal());
     simulateFrame(100);
     EXPECT_EQ(std::numeric_limits<double>::max(), animation->currentTimeInternal());
 }
 
 TEST_F(AnimationAnimationTest, SetCurrentTimeSetsStartTime)
 {
@@ skipping 97 matching lines @@
     animation->play();
     EXPECT_EQ(Animation::Pending, animation->playStateInternal());
     simulateFrame(20);
     EXPECT_EQ(Animation::Running, animation->playStateInternal());
     EXPECT_FALSE(animation->paused());
     EXPECT_EQ(10, animation->currentTimeInternal());
     simulateFrame(30);
     EXPECT_EQ(20, animation->currentTimeInternal());
 }
 
+TEST_F(AnimationAnimationTest, PauseBeforeTimelineStarted)
+{
+    setUpWithoutStartingTimeline();
+    animation->pause();
+    EXPECT_TRUE(animation->paused());
+    animation->play();
+    EXPECT_FALSE(animation->paused());
+
+    animation->pause();
+    startTimeline();
+    simulateFrame(100);
+    EXPECT_TRUE(animation->paused());
+    EXPECT_EQ(0, animation->currentTimeInternal());
+}
+
 TEST_F(AnimationAnimationTest, PlayRewindsToStart)
 {
     animation->setCurrentTimeInternal(30);
     animation->play();
     EXPECT_EQ(0, animation->currentTimeInternal());
 
     animation->setCurrentTimeInternal(40);
     animation->play();
     EXPECT_EQ(0, animation->currentTimeInternal());
     EXPECT_EQ(Animation::Pending, animation->playStateInternal());
@@ skipping 199 matching lines @@
 
 TEST_F(AnimationAnimationTest, SetPlaybackRate)
 {
     animation->setPlaybackRate(2);
     simulateFrame(0);
     EXPECT_EQ(2, animation->playbackRate());
     EXPECT_EQ(0, animation->currentTimeInternal());
     simulateFrame(10);
     EXPECT_EQ(20, animation->currentTimeInternal());
 }
+
+TEST_F(AnimationAnimationTest, SetPlaybackRateBeforeTimelineStarted)
+{
+    setUpWithoutStartingTimeline();
+    animation->setPlaybackRate(2);
+    EXPECT_EQ(2, animation->playbackRate());
+    EXPECT_EQ(0, animation->currentTimeInternal());
+    startTimeline();
+    simulateFrame(10);
+    EXPECT_EQ(20, animation->currentTimeInternal());
+}
 
 TEST_F(AnimationAnimationTest, SetPlaybackRateWhilePaused)
 {
     simulateFrame(10);
     animation->pause();
     animation->setPlaybackRate(2);
     simulateFrame(20);
     animation->play();
     EXPECT_EQ(10, animation->currentTimeInternal());
     simulateFrame(20);
@@ skipping 289 matching lines @@
     EXPECT_EQ(Animation::Idle, animation->playStateInternal());
     EXPECT_TRUE(std::isnan(animation->currentTime()));
     EXPECT_TRUE(std::isnan(animation->startTime()));
     animation->pause();
     EXPECT_EQ(Animation::Idle, animation->playStateInternal());
     EXPECT_TRUE(std::isnan(animation->currentTime()));
     EXPECT_TRUE(std::isnan(animation->startTime()));
 }
 
 } // namespace blink