Merge AnimationTimeline and DocumentTimeline

third_party/WebKit/Source/core/animation/Animation.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * 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 "core/animation/AnimationTimeline.h"
 #include "core/animation/CompositorPendingAnimations.h"
 #include "core/animation/DocumentTimeline.h"
 #include "core/animation/KeyframeEffectReadOnly.h"
 #include "core/animation/SuperAnimationTimeline.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/StyleChangeReason.h"
@@ skipping 19 matching lines @@
 namespace {
 
 static unsigned NextSequenceNumber() {
   static unsigned next = 0;
   return ++next;
 }
 }
 
 Animation* Animation::Create(AnimationEffectReadOnly* effect,
                              SuperAnimationTimeline* timeline) {
-  if (!timeline || !timeline->IsAnimationTimeline()) {
+  if (!timeline || !timeline->IsDocumentTimeline()) {
     // FIXME: Support creating animations without a timeline.
     NOTREACHED();
     return nullptr;
   }
 
-  AnimationTimeline* subtimeline = ToAnimationTimeline(timeline);
+  DocumentTimeline* subtimeline = ToDocumentTimeline(timeline);
 
   Animation* animation = new Animation(
       subtimeline->GetDocument()->ContextDocument(), *subtimeline, effect);
 
   if (subtimeline) {
     subtimeline->AnimationAttached(*animation);
     animation->AttachCompositorTimeline();
   }
 
   return animation;
@@ skipping 15 matching lines @@
   DCHECK(RuntimeEnabledFeatures::WebAnimationsAPIEnabled());
 
   if (!timeline) {
     return Create(execution_context, effect, exception_state);
   }
 
   return Create(effect, timeline);
 }
 
 Animation::Animation(ExecutionContext* execution_context,
-                     AnimationTimeline& timeline,
+                     DocumentTimeline& timeline,
                      AnimationEffectReadOnly* content)
     : ContextLifecycleObserver(execution_context),
       play_state_(kIdle),
       playback_rate_(1),
       start_time_(NullValue()),
       hold_time_(0),
       sequence_number_(NextSequenceNumber()),
       content_(content),
       timeline_(&timeline),
       paused_(false),
@@ skipping 18 matching lines @@
   probe::didCreateAnimation(timeline_->GetDocument(), sequence_number_);
 }
 
 Animation::~Animation() {
   // Verify that m_compositorPlayer has been disposed of.
   DCHECK(!compositor_player_);
 }
 
 void Animation::Dispose() {
   DestroyCompositorPlayer();
-  // If the AnimationTimeline and its Animation objects are
+  // If the DocumentTimeline and its Animation objects are
   // finalized by the same GC, we have to eagerly clear out
   // this Animation object's compositor player registration.
   DCHECK(!compositor_player_);
 }
 
 double Animation::EffectEnd() const {
   return content_ ? content_->EndTimeInternal() : 0;
 }
 
 bool Animation::Limited(double current_time) const {
@@ skipping 1116 matching lines @@
   DCHECK(!compositor_player_);
 }
 
 void Animation::CompositorAnimationPlayerHolder::Detach() {
   DCHECK(compositor_player_);
   compositor_player_->SetAnimationDelegate(nullptr);
   animation_ = nullptr;
   compositor_player_.reset();
 }
 }  // namespace blink