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

Unified Diff: Source/core/animation/AnimationPlayer.h

Issue 293893003: Web Animations: Rename TimedItem to AnimationSource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update expectations. Created 6 years, 7 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 | « Source/core/animation/Animation.idl ('k') | Source/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationPlayer.h
diff --git a/Source/core/animation/AnimationPlayer.h b/Source/core/animation/AnimationPlayer.h
index f247dd16a52227714ad7c57b8f2ff38618ce912f..2d1fd6c509dfb4166b46253feeff789e2a18218c 100644
--- a/Source/core/animation/AnimationPlayer.h
+++ b/Source/core/animation/AnimationPlayer.h
@@ -31,7 +31,7 @@
#ifndef AnimationPlayer_h
#define AnimationPlayer_h
-#include "core/animation/TimedItem.h"
+#include "core/animation/AnimationSource.h"
#include "core/events/EventTarget.h"
#include "wtf/RefPtr.h"
@@ -45,7 +45,7 @@ class AnimationPlayer FINAL : public RefCountedWillBeRefCountedGarbageCollected<
public:
~AnimationPlayer();
- static PassRefPtrWillBeRawPtr<AnimationPlayer> create(AnimationTimeline&, TimedItem*);
+ static PassRefPtrWillBeRawPtr<AnimationPlayer> create(AnimationTimeline&, AnimationSource*);
// Returns whether the player is finished.
bool update(TimingUpdateReason);
@@ -94,10 +94,10 @@ public:
void setStartTime(double startTime) { setStartTimeInternal(startTime / 1000); }
void setStartTimeInternal(double, bool isUpdateFromCompositor = false);
- const TimedItem* source() const { return m_content.get(); }
- TimedItem* source() { return m_content.get(); }
- TimedItem* source(bool& isNull) { isNull = !m_content; return m_content.get(); }
- void setSource(TimedItem*);
+ const AnimationSource* source() const { return m_content.get(); }
+ AnimationSource* source() { return m_content.get(); }
+ AnimationSource* source(bool& isNull) { isNull = !m_content; return m_content.get(); }
+ void setSource(AnimationSource*);
double timeLag() { return timeLagInternal() * 1000; }
double timeLagInternal() { return currentTimeWithoutLag() - currentTimeInternal(); }
@@ -150,7 +150,7 @@ public:
void trace(Visitor*);
private:
- AnimationPlayer(AnimationTimeline&, TimedItem*);
+ AnimationPlayer(AnimationTimeline&, AnimationSource*);
double sourceEnd() const;
bool limited(double currentTime) const;
double currentTimeWithoutLag() const;
@@ -165,7 +165,7 @@ private:
SortInfo m_sortInfo;
- RefPtrWillBeMember<TimedItem> m_content;
+ RefPtrWillBeMember<AnimationSource> m_content;
RawPtrWillBeMember<AnimationTimeline> m_timeline;
// Reflects all pausing, including via pauseForTesting().
bool m_paused;
« no previous file with comments | « Source/core/animation/Animation.idl ('k') | Source/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698