Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1887)

Unified Diff: third_party/WebKit/Source/core/animation/Animation.h

Issue 2944423003: Implement new AnimationTimeline superclass (Closed)
Patch Set: Rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/Animation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6c52f89a0f0c38d1ec8f98697cf478e5421f9539..f507056e1673c212fc7d2e3b40aaeb17baf939a5 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/animation/CompositorAnimations.h"
#include "core/dom/ContextLifecycleObserver.h"
#include "core/dom/DOMException.h"
@@ -51,7 +52,6 @@
namespace blink {
-class AnimationTimeline;
class CompositorAnimationPlayer;
class Element;
class ExceptionState;
@@ -75,7 +75,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*,
@@ -83,7 +83,7 @@ class CORE_EXPORT Animation final : public EventTargetWithInlineData,
ExceptionState&);
static Animation* Create(ExecutionContext*,
AnimationEffectReadOnly*,
- AnimationTimeline*,
+ SuperAnimationTimeline*,
ExceptionState&);
~Animation();
@@ -139,8 +139,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_; }
double CalculateStartTime(double current_time) const;
bool HasStartTime() const { return !IsNull(start_time_); }
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698