Merge AnimationTimeline and DocumentTimeline

third_party/WebKit/Source/core/animation/CompositorAnimationsTest.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/CompositorAnimations.h"
 
 #include <memory>
 #include "core/animation/Animation.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/animation/animatable/AnimatableDouble.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/dom/Document.h"
 #include "core/layout/LayoutObject.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/style/FilterOperations.h"
 #include "core/testing/DummyPageHolder.h"
@@ skipping 23 matching lines @@
 
   Timing timing_;
   CompositorAnimations::CompositorTiming compositor_timing_;
   std::unique_ptr<AnimatableValueKeyframeVector> keyframe_vector2_;
   Persistent<AnimatableValueKeyframeEffectModel> keyframe_animation_effect2_;
   std::unique_ptr<AnimatableValueKeyframeVector> keyframe_vector5_;
   Persistent<AnimatableValueKeyframeEffectModel> keyframe_animation_effect5_;
 
   Persistent<Document> document_;
   Persistent<Element> element_;
-  Persistent<AnimationTimeline> timeline_;
+  Persistent<DocumentTimeline> timeline_;
   std::unique_ptr<DummyPageHolder> page_holder_;
 
   void SetUp() override {
     linear_timing_function_ = LinearTimingFunction::Shared();
     cubic_ease_timing_function_ = CubicBezierTimingFunction::Preset(
         CubicBezierTimingFunction::EaseType::EASE);
     cubic_custom_timing_function_ =
         CubicBezierTimingFunction::Create(1, 2, 3, 4);
     step_timing_function_ =
         StepsTimingFunction::Create(1, StepsTimingFunction::StepPosition::END);
@@ skipping 10 matching lines @@
         AnimatableValueKeyframeEffectModel::Create(*keyframe_vector2_);
 
     keyframe_vector5_ = CreateCompositableFloatKeyframeVector(5);
     keyframe_animation_effect5_ =
         AnimatableValueKeyframeEffectModel::Create(*keyframe_vector5_);
 
     page_holder_ = DummyPageHolder::Create();
     document_ = &page_holder_->GetDocument();
     document_->GetAnimationClock().ResetTimeForTesting();
 
-    timeline_ = AnimationTimeline::Create(document_.Get());
+    timeline_ = DocumentTimeline::Create(document_.Get());
     timeline_->ResetForTesting();
     element_ = document_->createElement("test");
   }
 
  public:
   bool ConvertTimingForCompositor(const Timing& t,
                                   CompositorAnimations::CompositorTiming& out) {
     return CompositorAnimations::ConvertTimingForCompositor(t, 0, out, 1);
   }
   bool CanStartEffectOnCompositor(const Timing& timing,
@@ skipping 1204 matching lines @@
   // Clearing the effect node entirely should also produce false.
   properties.ClearEffect();
   EXPECT_FALSE(
       CompositorAnimations::CheckCanStartElementOnCompositor(*element).Ok());
 
   element->SetLayoutObject(nullptr);
   LayoutObjectProxy::Dispose(layout_object);
 }
 
 }  // namespace blink