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

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

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No, really. Created 5 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/AnimationTest.cpp ('k') | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationTimeline.h
diff --git a/Source/core/animation/AnimationTimeline.h b/Source/core/animation/AnimationTimeline.h
index cbf51d271fb09ad5ecea7c64063b98e818aa0d80..5e24cd2530a266e05944084241f51e71fd389e0c 100644
--- a/Source/core/animation/AnimationTimeline.h
+++ b/Source/core/animation/AnimationTimeline.h
@@ -33,8 +33,8 @@
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/CoreExport.h"
-#include "core/animation/AnimationEffect.h"
-#include "core/animation/AnimationPlayer.h"
+#include "core/animation/Animation.h"
+#include "core/animation/EffectModel.h"
#include "core/dom/Element.h"
#include "platform/Timer.h"
#include "platform/heap/Handle.h"
@@ -46,7 +46,7 @@
namespace blink {
class Document;
-class AnimationNode;
+class AnimationEffect;
// AnimationTimeline is constructed and owned by Document, and tied to its lifecycle.
class CORE_EXPORT AnimationTimeline : public RefCountedWillBeGarbageCollectedFinalized<AnimationTimeline>, public ScriptWrappable {
@@ -69,19 +69,19 @@ public:
void serviceAnimations(TimingUpdateReason);
void scheduleNextService();
- AnimationPlayer* play(AnimationNode*);
- WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer>> getAnimationPlayers();
+ Animation* play(AnimationEffect*);
+ WillBeHeapVector<RefPtrWillBeMember<Animation>> getAnimations();
- void playerAttached(AnimationPlayer&);
+ void animationAttached(Animation&);
#if !ENABLE(OILPAN)
- void playerDestroyed(AnimationPlayer* player)
+ void animationDestroyed(Animation* animation)
{
- ASSERT(m_players.contains(player));
- m_players.remove(player);
+ ASSERT(m_animations.contains(animation));
+ m_animations.remove(animation);
}
#endif
- bool hasPendingUpdates() const { return !m_playersNeedingUpdate.isEmpty(); }
+ bool hasPendingUpdates() const { return !m_animationsNeedingUpdate.isEmpty(); }
double zeroTime();
double currentTime(bool& isNull);
double currentTime();
@@ -92,8 +92,8 @@ public:
double effectiveTime();
void pauseAnimationsForTesting(double);
- void setOutdatedAnimationPlayer(AnimationPlayer*);
- bool hasOutdatedAnimationPlayer() const;
+ void setOutdatedAnimation(Animation*);
+ bool hasOutdatedAnimation() const;
bool needsAnimationTimingUpdate();
void setPlaybackRate(double);
@@ -116,10 +116,10 @@ private:
RawPtrWillBeMember<Document> m_document;
double m_zeroTime;
bool m_zeroTimeInitialized;
- // AnimationPlayers which will be updated on the next frame
+ // Animations which will be updated on the next frame
// i.e. current, in effect, or had timing changed
- WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer>> m_playersNeedingUpdate;
- WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer>> m_players;
+ WillBeHeapHashSet<RefPtrWillBeMember<Animation>> m_animationsNeedingUpdate;
+ WillBeHeapHashSet<RawPtrWillBeWeakMember<Animation>> m_animations;
double m_playbackRate;
« no previous file with comments | « Source/core/animation/AnimationTest.cpp ('k') | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698