Merge AnimationTimeline and DocumentTimeline

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/animation/Animation.h"
 
 #include <memory>
 #include "core/animation/AnimationClock.h"
-#include "core/animation/AnimationTimeline.h"
 #include "core/animation/CompositorPendingAnimations.h"
+#include "core/animation/DocumentTimeline.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Document.h"
 #include "core/dom/QualifiedName.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/paint/PaintLayer.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/weborigin/KURL.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class AnimationAnimationTest : public RenderingTest {
  public:
   AnimationAnimationTest()
       : RenderingTest(SingleChildLocalFrameClient::Create()) {}
 
   void SetUp() override {
     RenderingTest::SetUp();
     SetUpWithoutStartingTimeline();
     StartTimeline();
   }
 
   void SetUpWithoutStartingTimeline() {
     page_holder = DummyPageHolder::Create();
     document = &page_holder->GetDocument();
     document->GetAnimationClock().ResetTimeForTesting();
-    timeline = AnimationTimeline::Create(document.Get());
+    timeline = DocumentTimeline::Create(document.Get());
     timeline->ResetForTesting();
     animation = timeline->Play(0);
     animation->setStartTime(0, false);
     animation->setEffect(MakeAnimation());
   }
 
   void StartTimeline() { SimulateFrame(0); }
 
   KeyframeEffect* MakeAnimation(double duration = 30,
                                 double playback_rate = 1) {
     Timing timing;
     timing.iteration_duration = duration;
     timing.playback_rate = playback_rate;
     return KeyframeEffect::Create(0, nullptr, timing);
   }
 
   bool SimulateFrame(double time,
                      Optional<CompositorElementIdSet> composited_element_ids =
                          Optional<CompositorElementIdSet>()) {
     document->GetAnimationClock().UpdateTime(time);
     document->GetCompositorPendingAnimations().Update(composited_element_ids,
                                                       false);
     // The timeline does not know about our animation, so we have to explicitly
     // call update().
     return animation->Update(kTimingUpdateForAnimationFrame);
   }
 
   Persistent<Document> document;
-  Persistent<AnimationTimeline> timeline;
+  Persistent<DocumentTimeline> timeline;
   Persistent<Animation> animation;
   std::unique_ptr<DummyPageHolder> page_holder;
 };
 
 TEST_F(AnimationAnimationTest, InitialState) {
   SetUpWithoutStartingTimeline();
   animation = timeline->Play(0);
   EXPECT_EQ(Animation::kPending, animation->PlayStateInternal());
   EXPECT_EQ(0, animation->CurrentTimeInternal());
   EXPECT_FALSE(animation->Paused());
@@ skipping 722 matching lines @@
       animation_composited
           ->CheckCanStartAnimationOnCompositorInternal(composited_element_ids)
           .Ok());
   EXPECT_FALSE(
       animation_not_composited
           ->CheckCanStartAnimationOnCompositorInternal(composited_element_ids)
           .Ok());
 }
 
 }  // namespace blink