Revert of Web Animations: Use a single animation clock

third_party/WebKit/Source/core/animation/AnimationTimelineTest.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/AnimationTimeline.h"
 
 #include "core/animation/AnimationClock.h"
 #include "core/animation/AnimationEffect.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/QualifiedName.h"
-#include "core/testing/DummyPageHolder.h"
 #include "platform/weborigin/KURL.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class MockPlatformTiming : public AnimationTimeline::PlatformTiming {
 public:
 
@@ skipping 16 matching lines @@
     DEFINE_INLINE_TRACE()
     {
         AnimationTimeline::PlatformTiming::trace(visitor);
     }
 };
 
 class AnimationAnimationTimelineTest : public ::testing::Test {
 protected:
     virtual void SetUp()
     {
-        pageHolder = DummyPageHolder::create();
-        document = &pageHolder->document();
+        document = Document::create();
         document->animationClock().resetTimeForTesting();
-        updateClock(0);
         element = Element::create(QualifiedName::null() , document.get());
         platformTiming = new MockPlatformTiming;
         timeline = AnimationTimeline::create(document.get(), platformTiming);
         ASSERT_EQ(0, timeline->currentTimeInternal());
     }
 
     virtual void TearDown()
     {
         document.release();
         element.release();
         timeline.release();
 #if ENABLE(OILPAN)
         Heap::collectAllGarbage();
 #endif
     }
 
-    void updateClock(double time)
-    {
-        document->animationClock().updateTime(document->timeline().zeroTime() + time);
-    }
-
     void updateClockAndService(double time)
     {
-        updateClock(time);
+        document->animationClock().updateTime(time);
         document->compositorPendingAnimations().update(false);
         timeline->serviceAnimations(TimingUpdateForAnimationFrame);
         timeline->scheduleNextService();
     }
 
-    OwnPtr<DummyPageHolder> pageHolder;
     RefPtrWillBePersistent<Document> document;
     RefPtrWillBePersistent<Element> element;
     Persistent<AnimationTimeline> timeline;
     Timing timing;
     Persistent<MockPlatformTiming> platformTiming;
 
     void wake()
     {
         timeline->wake();
     }
@@ skipping 42 matching lines @@
     platformTiming->expectNoMoreActions();
     updateClockAndService(100);
     EXPECT_FLOAT_EQ(100, timeline->currentTimeInternal());
 }
 
 TEST_F(AnimationAnimationTimelineTest, ZeroTime)
 {
     timeline = AnimationTimeline::create(document.get());
     bool isNull;
 
-    updateClock(100);
+    document->animationClock().updateTime(100);
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 
-    updateClock(200);
+    document->animationClock().updateTime(200);
     EXPECT_EQ(200, timeline->currentTimeInternal());
     EXPECT_EQ(200, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 }
 
 TEST_F(AnimationAnimationTimelineTest, PlaybackRateNormal)
 {
     timeline = AnimationTimeline::create(document.get());
     double zeroTime = timeline->zeroTime();
     bool isNull;
 
     timeline->setPlaybackRate(1.0);
     EXPECT_EQ(1.0, timeline->playbackRate());
-    updateClock(100);
+    document->animationClock().updateTime(100);
     EXPECT_EQ(zeroTime, timeline->zeroTime());
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 
-    updateClock(200);
+    document->animationClock().updateTime(200);
     EXPECT_EQ(zeroTime, timeline->zeroTime());
     EXPECT_EQ(200, timeline->currentTimeInternal());
     EXPECT_EQ(200, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 }
 
 TEST_F(AnimationAnimationTimelineTest, PlaybackRatePause)
 {
     timeline = AnimationTimeline::create(document.get());
     bool isNull;
-    double zeroTime = timeline->zeroTime();
 
-    updateClock(100);
-    EXPECT_EQ(zeroTime, timeline->zeroTime());
+    document->animationClock().updateTime(100);
+    EXPECT_EQ(0, timeline->zeroTime());
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 
     timeline->setPlaybackRate(0.0);
     EXPECT_EQ(0.0, timeline->playbackRate());
-    updateClock(200);
+    document->animationClock().updateTime(200);
     EXPECT_EQ(100, timeline->zeroTime());
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
 
     timeline->setPlaybackRate(1.0);
     EXPECT_EQ(1.0, timeline->playbackRate());
-    updateClock(400);
-    EXPECT_EQ(zeroTime + 100, timeline->zeroTime());
+    document->animationClock().updateTime(400);
+    EXPECT_EQ(100, timeline->zeroTime());
     EXPECT_EQ(300, timeline->currentTimeInternal());
     EXPECT_EQ(300, timeline->currentTimeInternal(isNull));
 
     EXPECT_FALSE(isNull);
 }
 
 TEST_F(AnimationAnimationTimelineTest, PlaybackRateSlow)
 {
     timeline = AnimationTimeline::create(document.get());
     bool isNull;
-    double zeroTime = timeline->zeroTime();
 
-    updateClock(100);
-    EXPECT_EQ(zeroTime, timeline->zeroTime());
+    document->animationClock().updateTime(100);
+    EXPECT_EQ(0, timeline->zeroTime());
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 
     timeline->setPlaybackRate(0.5);
     EXPECT_EQ(0.5, timeline->playbackRate());
-    updateClock(300);
-    EXPECT_EQ(zeroTime - 100, timeline->zeroTime());
+    document->animationClock().updateTime(300);
+    EXPECT_EQ(-100, timeline->zeroTime());
     EXPECT_EQ(200, timeline->currentTimeInternal());
     EXPECT_EQ(200, timeline->currentTimeInternal(isNull));
 
     timeline->setPlaybackRate(1.0);
     EXPECT_EQ(1.0, timeline->playbackRate());
-    updateClock(400);
-    EXPECT_EQ(zeroTime + 100, timeline->zeroTime());
+    document->animationClock().updateTime(400);
+    EXPECT_EQ(100, timeline->zeroTime());
     EXPECT_EQ(300, timeline->currentTimeInternal());
     EXPECT_EQ(300, timeline->currentTimeInternal(isNull));
 
     EXPECT_FALSE(isNull);
 }
 
 TEST_F(AnimationAnimationTimelineTest, PlaybackRateFast)
 {
     timeline = AnimationTimeline::create(document.get());
     bool isNull;
-    double zeroTime = timeline->zeroTime();
 
-    updateClock(100);
-    EXPECT_EQ(zeroTime, timeline->zeroTime());
+    document->animationClock().updateTime(100);
+    EXPECT_EQ(0, timeline->zeroTime());
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
     EXPECT_FALSE(isNull);
 
     timeline->setPlaybackRate(2.0);
     EXPECT_EQ(2.0, timeline->playbackRate());
-    updateClock(300);
-    EXPECT_EQ(zeroTime + 50, timeline->zeroTime());
+    document->animationClock().updateTime(300);
+    EXPECT_EQ(50, timeline->zeroTime());
     EXPECT_EQ(500, timeline->currentTimeInternal());
     EXPECT_EQ(500, timeline->currentTimeInternal(isNull));
 
     timeline->setPlaybackRate(1.0);
     EXPECT_EQ(1.0, timeline->playbackRate());
-    updateClock(400);
-    EXPECT_EQ(zeroTime - 200, timeline->zeroTime());
+    document->animationClock().updateTime(400);
+    EXPECT_EQ(-200, timeline->zeroTime());
     EXPECT_EQ(600, timeline->currentTimeInternal());
     EXPECT_EQ(600, timeline->currentTimeInternal(isNull));
 
     EXPECT_FALSE(isNull);
 }
 
 TEST_F(AnimationAnimationTimelineTest, SetCurrentTime)
 {
     timeline = AnimationTimeline::create(document.get());
     double zeroTime = timeline->zeroTime();
 
-    updateClock(100);
+    document->animationClock().updateTime(100);
     EXPECT_EQ(zeroTime, timeline->zeroTime());
     EXPECT_EQ(100, timeline->currentTimeInternal());
 
     timeline->setCurrentTimeInternal(0);
     EXPECT_EQ(0, timeline->currentTimeInternal());
     EXPECT_EQ(zeroTime + 100, timeline->zeroTime());
 
     timeline->setCurrentTimeInternal(100);
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(zeroTime, timeline->zeroTime());
 
     timeline->setCurrentTimeInternal(200);
     EXPECT_EQ(200, timeline->currentTimeInternal());
     EXPECT_EQ(zeroTime - 100, timeline->zeroTime());
 
-    updateClock(200);
+    document->animationClock().updateTime(200);
     EXPECT_EQ(300, timeline->currentTimeInternal());
     EXPECT_EQ(zeroTime - 100, timeline->zeroTime());
 
     timeline->setCurrentTimeInternal(0);
     EXPECT_EQ(0, timeline->currentTimeInternal());
     EXPECT_EQ(zeroTime + 200, timeline->zeroTime());
 
     timeline->setCurrentTimeInternal(100);
     EXPECT_EQ(100, timeline->currentTimeInternal());
     EXPECT_EQ(zeroTime + 100, timeline->zeroTime());
@@ skipping 68 matching lines @@
 
 TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref)
 {
     Animation* animation = timeline->play(0);
     timeline.clear();
     // Test passes if this does not crash.
     animation->setStartTime(0);
 }
 
 }