Chromium Code Reviews| Index: third_party/WebKit/Source/core/animation/Animation.h |
| diff --git a/third_party/WebKit/Source/core/animation/Animation.h b/third_party/WebKit/Source/core/animation/Animation.h |
| index 78d6044f84081ef42c6bc3f08276681ca585e93b..f8bec0aaad93f33f4693f67ba01534cde039a8c5 100644 |
| --- a/third_party/WebKit/Source/core/animation/Animation.h |
| +++ b/third_party/WebKit/Source/core/animation/Animation.h |
| @@ -38,6 +38,7 @@ |
| #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" |
| @@ -50,7 +51,6 @@ |
| namespace blink { |
| -class AnimationTimeline; |
| class CompositorAnimationPlayer; |
| class Element; |
| class ExceptionState; |
| @@ -74,7 +74,7 @@ class CORE_EXPORT Animation final : public EventTargetWithInlineData, |
| kFinished |
| }; |
| - static Animation* Create(AnimationEffectReadOnly*, AnimationTimeline*); |
| + static Animation* Create(AnimationEffectReadOnly*, SuperAnimationTimeline*); |
| // Web Animations API IDL constructors. |
| static Animation* Create(ExecutionContext*, |
| @@ -82,7 +82,7 @@ class CORE_EXPORT Animation final : public EventTargetWithInlineData, |
| ExceptionState&); |
| static Animation* Create(ExecutionContext*, |
| AnimationEffectReadOnly*, |
| - AnimationTimeline*, |
| + SuperAnimationTimeline*, |
| ExceptionState&); |
| ~Animation(); |
| @@ -138,8 +138,11 @@ class CORE_EXPORT Animation final : public EventTargetWithInlineData, |
| 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) Docu
|
| double CalculateStartTime(double current_time) const; |
| bool HasStartTime() const { return !IsNull(start_time_); } |