Implement new AnimationTimeline superclass

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/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"
 
 namespace blink {
 
-class AnimationTimeline;
 class CompositorAnimationPlayer;
 class Element;
 class ExceptionState;
 class TreeScope;
 
 class CORE_EXPORT Animation final : public EventTargetWithInlineData,
                                     public ActiveScriptWrappable<Animation>,
                                     public ContextLifecycleObserver,
                                     public CompositorAnimationDelegate,
                                     public CompositorAnimationPlayerClient {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(Animation);
 
  public:
   enum AnimationPlayState {
     kUnset,
     kIdle,
     kPending,
     kRunning,
     kPaused,
     kFinished
   };
 
-  static Animation* Create(AnimationEffectReadOnly*, AnimationTimeline*);
+  static Animation* Create(AnimationEffectReadOnly*, SuperAnimationTimeline*);
 
   // Web Animations API IDL constructors.
   static Animation* Create(ExecutionContext*,
                            AnimationEffectReadOnly*,
                            ExceptionState&);
   static Animation* Create(ExecutionContext*,
                            AnimationEffectReadOnly*,
-                           AnimationTimeline*,
+                           SuperAnimationTimeline*,
                            ExceptionState&);
 
   ~Animation();
   void Dispose();
 
   // Returns whether the animation is finished.
   bool Update(TimingUpdateReason);
 
   // timeToEffectChange returns:
   //  infinity  - if this animation is no longer in effect
@@ skipping 35 matching lines @@
   DEFINE_ATTRIBUTE_EVENT_LISTENER(finish);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(cancel);
 
   const AtomicString& InterfaceName() const override;
   ExecutionContext* GetExecutionContext() const override;
   bool HasPendingActivity() const final;
   void ContextDestroyed(ExecutionContext*) override;
 
   double playbackRate() const;
   void setPlaybackRate(double);
-  const AnimationTimeline* timeline() const { return timeline_; }
-  AnimationTimeline* timeline() { return timeline_; }
+  SuperAnimationTimeline* timeline() {
+    return static_cast<SuperAnimationTimeline*>(timeline_);
+  }
+  const AnimationTimeline* TimelineInternal() const { return timeline_; }
+  AnimationTimeline* TimelineInternal() { return timeline_; }

[alancutter (OOO until 2018), 2017/06/21 05:36:17]

Add TODO to remove the dependency on (future) DocumentTimeline.

 
   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 213 matching lines @@
 
   bool effect_suppressed_;
 
   FRIEND_TEST_ALL_PREFIXES(AnimationAnimationTest,
                            NoCompositeWithoutCompositedElementId);
 };
 
 }  // namespace blink
 
 #endif  // Animation_h