Web Animations: Update naming to reflect spec changes

Source/core/animation/css/CSSAnimations.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 37 matching lines @@
 class Element;
 class StylePropertyShorthand;
 class StyleResolver;
 
 class CSSAnimations final {
     WTF_MAKE_NONCOPYABLE(CSSAnimations);
     DISALLOW_ALLOCATION();
 public:
     CSSAnimations();
 
-    const AtomicString getAnimationNameForInspector(const AnimationPlayer&);
-    bool isTransitionAnimationForInspector(const AnimationPlayer&) const;
+    const AtomicString getAnimationNameForInspector(const Animation&);
+    bool isTransitionAnimationForInspector(const Animation&) const;
 
     static const StylePropertyShorthand& propertiesForTransitionAll();
     static bool isAllowedAnimation(CSSPropertyID);
     static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*);
 
     void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m_pendingUpdate = update; }
     void maybeApplyPendingUpdate(Element*);
     bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpty() && !m_pendingUpdate; }
     void cancel();
 
     DECLARE_TRACE();
 
 private:
     class RunningAnimation final : public RefCountedWillBeGarbageCollectedFinalized<RunningAnimation> {
     public:
-        RunningAnimation(PassRefPtrWillBeRawPtr<AnimationPlayer> player, CSSAnimationUpdate::NewAnimation animation)
-            : player(player)
-            , specifiedTiming(animation.timing)
-            , styleRule(animation.styleRule)
-            , styleRuleVersion(animation.styleRuleVersion)
+        RunningAnimation(PassRefPtrWillBeRawPtr<Animation> animation, CSSAnimationUpdate::NewAnimation newAnimation)
+            : animation(animation)
+            , specifiedTiming(newAnimation.timing)
+            , styleRule(newAnimation.styleRule)
+            , styleRuleVersion(newAnimation.styleRuleVersion)
         {
         }
 
         void update(CSSAnimationUpdate::UpdatedAnimation update)
         {
             styleRule = update.styleRule;
             styleRuleVersion = update.styleRuleVersion;
             specifiedTiming = update.specifiedTiming;
         }
 
         DEFINE_INLINE_TRACE()
         {
-            visitor->trace(player);
+            visitor->trace(animation);
             visitor->trace(styleRule);
         }
 
-        RefPtrWillBeMember<AnimationPlayer> player;
+        RefPtrWillBeMember<Animation> animation;
         Timing specifiedTiming;
         RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
         unsigned styleRuleVersion;
     };
 
     struct RunningTransition {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
         DEFINE_INLINE_TRACE()
         {
-            visitor->trace(player);
+            visitor->trace(animation);
             visitor->trace(from);
             visitor->trace(to);
         }
 
-        RefPtrWillBeMember<AnimationPlayer> player;
+        RefPtrWillBeMember<Animation> animation;
         RawPtrWillBeMember<const AnimatableValue> from;
         RawPtrWillBeMember<const AnimatableValue> to;
     };
 
     using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<RunningAnimation>>;
     AnimationMap m_animations;
 
     using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>;
     TransitionMap m_transitions;
 
     OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate;
 
     ActiveInterpolationMap m_previousActiveInterpolationsForAnimations;
 
     static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*);
     static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element* animatingElement, const ComputedStyle&);
     static void calculateTransitionUpdateForProperty(CSSPropertyID, CSSPropertyID eventId, const CSSTransitionData&, size_t transitionIndex, const ComputedStyle& oldStyle, const ComputedStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate*, const Element*);
 
     static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);
     static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);
 
-    class AnimationEventDelegate final : public AnimationNode::EventDelegate {
+    class AnimationEventDelegate final : public AnimationEffect::EventDelegate {
     public:
         AnimationEventDelegate(Element* animationTarget, const AtomicString& name)
             : m_animationTarget(animationTarget)
             , m_name(name)
-            , m_previousPhase(AnimationNode::PhaseNone)
+            , m_previousPhase(AnimationEffect::PhaseNone)
             , m_previousIteration(nullValue())
         {
         }
-        virtual bool requiresIterationEvents(const AnimationNode&) override;
-        virtual void onEventCondition(const AnimationNode&) override;
+        virtual bool requiresIterationEvents(const AnimationEffect&) override;
+        virtual void onEventCondition(const AnimationEffect&) override;
         DECLARE_VIRTUAL_TRACE();
 
     private:
         const Element& animationTarget() const { return *m_animationTarget; }
         EventTarget* eventTarget() const;
         Document& document() const { return m_animationTarget->document(); }
 
         void maybeDispatch(Document::ListenerType, const AtomicString& eventName, double elapsedTime);
         RawPtrWillBeMember<Element> m_animationTarget;
         const AtomicString m_name;
-        AnimationNode::Phase m_previousPhase;
+        AnimationEffect::Phase m_previousPhase;
         double m_previousIteration;
     };
 
-    class TransitionEventDelegate final : public AnimationNode::EventDelegate {
+    class TransitionEventDelegate final : public AnimationEffect::EventDelegate {
     public:
         TransitionEventDelegate(Element* transitionTarget, CSSPropertyID property)
             : m_transitionTarget(transitionTarget)
             , m_property(property)
-            , m_previousPhase(AnimationNode::PhaseNone)
+            , m_previousPhase(AnimationEffect::PhaseNone)
         {
         }
-        virtual bool requiresIterationEvents(const AnimationNode&) override { return false; }
-        virtual void onEventCondition(const AnimationNode&) override;
+        virtual bool requiresIterationEvents(const AnimationEffect&) override { return false; }
+        virtual void onEventCondition(const AnimationEffect&) override;
         DECLARE_VIRTUAL_TRACE();
 
     private:
         const Element& transitionTarget() const { return *m_transitionTarget; }
         EventTarget* eventTarget() const;
         PseudoId pseudoId() const { return m_transitionTarget->pseudoId(); }
         Document& document() const { return m_transitionTarget->document(); }
 
         RawPtrWillBeMember<Element> m_transitionTarget;
         const CSSPropertyID m_property;
-        AnimationNode::Phase m_previousPhase;
+        AnimationEffect::Phase m_previousPhase;
     };
 };
 
 } // namespace blink
 
 #endif