Revert of Web Animations: Use a single animation clock

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/AnimationStack.h"
 
 #include "core/animation/AnimationClock.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/LegacyStyleInterpolation.h"
 #include "core/animation/animatable/AnimatableDouble.h"
-#include "core/testing/DummyPageHolder.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class AnimationAnimationStackTest : public ::testing::Test {
 protected:
     virtual void SetUp()
     {
-        pageHolder = DummyPageHolder::create();
-        document = &pageHolder->document();
+        document = Document::create();
         document->animationClock().resetTimeForTesting();
         timeline = AnimationTimeline::create(document.get());
         element = document->createElement("foo", ASSERT_NO_EXCEPTION);
     }
 
     Animation* play(KeyframeEffect* effect, double startTime)
     {
         Animation* animation = timeline->play(effect);
         animation->setStartTime(startTime * 1000);
         animation->update(TimingUpdateOnDemand);
         return animation;
     }
 
     void updateTimeline(double time)
     {
-        document->animationClock().updateTime(document->timeline().zeroTime() + time);
+        document->animationClock().updateTime(time);
         timeline->serviceAnimations(TimingUpdateForAnimationFrame);
     }
 
     const HeapVector<Member<SampledEffect>>& effects()
     {
         return element->ensureElementAnimations().animationStack().m_effects;
     }
 
     EffectModel* makeEffectModel(CSSPropertyID id, PassRefPtr<AnimatableValue> value)
     {
@@ skipping 21 matching lines @@
         timing.iterationDuration = duration;
         return KeyframeEffect::create(element.get(), effect, timing);
     }
 
     AnimatableValue* interpolationValue(const ActiveInterpolationsMap& activeInterpolations, CSSPropertyID id)
     {
         Interpolation& interpolation = *activeInterpolations.get(PropertyHandle(id)).at(0);
         return toLegacyStyleInterpolation(interpolation).currentValue().get();
     }
 
-    OwnPtr<DummyPageHolder> pageHolder;
     RefPtrWillBePersistent<Document> document;
     Persistent<AnimationTimeline> timeline;
     RefPtrWillBePersistent<Element> element;
 };
 
 TEST_F(AnimationAnimationStackTest, ElementAnimationsSorted)
 {
     play(makeKeyframeEffect(makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(1))), 10);
     play(makeKeyframeEffect(makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(2))), 15);
     play(makeKeyframeEffect(makeEffectModel(CSSPropertyFontSize, AnimatableDouble::create(3))), 5);
@@ skipping 34 matching lines @@
     ActiveInterpolationsMap result = AnimationStack::activeInterpolations(&element->elementAnimations()->animationStack(), 0, 0, KeyframeEffect::DefaultPriority);
     EXPECT_EQ(1u, result.size());
     EXPECT_TRUE(interpolationValue(result, CSSPropertyFontSize)->equals(AnimatableDouble::create(1).get()));
 
     animation->setEffect(0);
     result = AnimationStack::activeInterpolations(&element->elementAnimations()->animationStack(), 0, 0, KeyframeEffect::DefaultPriority);
     EXPECT_EQ(0u, result.size());
 }
 
 }