Web Animations: Update naming to reflect spec changes

Source/core/animation/AnimationTimeline.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef AnimationTimeline_h
 #define AnimationTimeline_h
 
 #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"
 #include "public/platform/WebCompositorAnimationTimeline.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 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 {
     DEFINE_WRAPPERTYPEINFO();
 public:
     class PlatformTiming : public NoBaseWillBeGarbageCollectedFinalized<PlatformTiming> {
 
     public:
         // Calls AnimationTimeline's wake() method after duration seconds.
         virtual void wakeAfter(double duration) = 0;
         virtual void cancelWake() = 0;
         virtual void serviceOnNextFrame() = 0;
         virtual ~PlatformTiming() { }
         DEFINE_INLINE_VIRTUAL_TRACE() { }
     };
 
     static PassRefPtrWillBeRawPtr<AnimationTimeline> create(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming> = nullptr);
     ~AnimationTimeline();
 
     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();
     double currentTimeInternal(bool& isNull);
     double currentTimeInternal();
     void setCurrentTime(double);
     void setCurrentTimeInternal(double);
     double effectiveTime();
     void pauseAnimationsForTesting(double);
 
-    void setOutdatedAnimationPlayer(AnimationPlayer*);
-    bool hasOutdatedAnimationPlayer() const;
+    void setOutdatedAnimation(Animation*);
+    bool hasOutdatedAnimation() const;
     bool needsAnimationTimingUpdate();
 
     void setPlaybackRate(double);
     double playbackRate() const;
 
     WebCompositorAnimationTimeline* compositorTimeline() const { return m_compositorTimeline.get(); }
 
     Document* document() { return m_document.get(); }
 #if !ENABLE(OILPAN)
     void detachFromDocument();
 #endif
     void wake();
 
     DECLARE_TRACE();
 
 protected:
     AnimationTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>);
 
 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;
 
     friend class SMILTimeContainer;
     static const double s_minimumDelay;
 
     OwnPtrWillBeMember<PlatformTiming> m_timing;
     double m_lastCurrentTimeInternal;
 
     OwnPtr<WebCompositorAnimationTimeline> m_compositorTimeline;
@@ skipping 19 matching lines @@
         RawPtrWillBeMember<AnimationTimeline> m_timeline;
         Timer<AnimationTimelineTiming> m_timer;
     };
 
     friend class AnimationAnimationTimelineTest;
 };
 
 } // namespace blink
 
 #endif