Merge AnimationTimeline and DocumentTimeline

third_party/WebKit/Source/core/animation/Animation.h

 /*
  * 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 @@
 #ifndef Animation_h
 #define Animation_h
 
 #include <memory>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseProperty.h"
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
 #include "core/animation/AnimationEffectReadOnly.h"
-#include "core/animation/AnimationTimeline.h"
 #include "core/animation/CompositorAnimations.h"
+#include "core/animation/DocumentTimeline.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/DOMException.h"
 #include "core/events/EventTarget.h"
 #include "platform/animation/CompositorAnimationDelegate.h"
 #include "platform/animation/CompositorAnimationPlayerClient.h"
 #include "platform/bindings/ActiveScriptWrappable.h"
 #include "platform/graphics/CompositorElementId.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/RefPtr.h"
 
@@ skipping 82 matching lines @@
   const AtomicString& InterfaceName() const override;
   ExecutionContext* GetExecutionContext() const override;
   bool HasPendingActivity() const final;
   void ContextDestroyed(ExecutionContext*) override;
 
   double playbackRate() const;
   void setPlaybackRate(double);
   SuperAnimationTimeline* timeline() {
     return static_cast<SuperAnimationTimeline*>(timeline_);
   }
-  const AnimationTimeline* TimelineInternal() const { return timeline_; }
-  AnimationTimeline* TimelineInternal() { return timeline_; }
+  const DocumentTimeline* TimelineInternal() const { return timeline_; }
+  DocumentTimeline* TimelineInternal() { return timeline_; }
 
   double CalculateStartTime(double current_time) const;
   bool HasStartTime() const { return !IsNull(start_time_); }
   double startTime(bool& is_null) const;
   double startTime() const;
   double StartTimeInternal() const { return start_time_; }
   void setStartTime(double, bool is_null);
   void SetStartTimeInternal(double);
 
   const AnimationEffectReadOnly* effect() const { return content_.Get(); }
@@ skipping 53 matching lines @@
   void InvalidateKeyframeEffect(const TreeScope&);
 
   DECLARE_VIRTUAL_TRACE();
 
  protected:
   DispatchEventResult DispatchEventInternal(Event*) override;
   void AddedEventListener(const AtomicString& event_type,
                           RegisteredEventListener&) override;
 
  private:
-  Animation(ExecutionContext*, AnimationTimeline&, AnimationEffectReadOnly*);
+  Animation(ExecutionContext*, DocumentTimeline&, AnimationEffectReadOnly*);
 
   void ClearOutdated();
   void ForceServiceOnNextFrame();
 
   double EffectEnd() const;
   bool Limited(double current_time) const;
 
   AnimationPlayState CalculatePlayState();
   double CalculateCurrentTime() const;
 
@@ skipping 30 matching lines @@
   double playback_rate_;
   double start_time_;
   double hold_time_;
 
   unsigned sequence_number_;
 
   Member<AnimationPromise> finished_promise_;
   Member<AnimationPromise> ready_promise_;
 
   Member<AnimationEffectReadOnly> content_;
-  Member<AnimationTimeline> timeline_;
+  Member<DocumentTimeline> timeline_;
 
   // Reflects all pausing, including via pauseForTesting().
   bool paused_;
   bool held_;
   bool is_paused_for_testing_;
   bool is_composited_animation_disabled_for_testing_;
 
   // This indicates timing information relevant to the animation's effect
   // has changed by means other than the ordinary progression of time
   bool outdated_;
@@ skipping 88 matching lines @@
 
   bool effect_suppressed_;
 
   FRIEND_TEST_ALL_PREFIXES(AnimationAnimationTest,
                            NoCompositeWithoutCompositedElementId);
 };
 
 }  // namespace blink
 
 #endif  // Animation_h