Web Animations: Update naming to reflect spec changes

Source/core/animation/ElementAnimations.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 24 matching lines @@
 #include "core/animation/css/CSSAnimations.h"
 #include "wtf/HashCountedSet.h"
 #include "wtf/HashMap.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class CSSAnimations;
 
-using AnimationPlayerCountedSet = WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<AnimationPlayer>>;
+using AnimationCountedSet = WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<Animation>>;
 
 class ElementAnimations : public NoBaseWillBeGarbageCollectedFinalized<ElementAnimations> {
     WTF_MAKE_NONCOPYABLE(ElementAnimations);
 public:
     ElementAnimations();
     ~ElementAnimations();
 
     // Animations that are currently active for this element, their effects will be applied
     // during a style recalc. CSS Transitions are included in this stack.
     AnimationStack& defaultStack() { return m_defaultStack; }
     const AnimationStack& defaultStack() const { return m_defaultStack; }
     // Tracks the state of active CSS Animations and Transitions. The individual animations
     // will also be part of the default stack, but the mapping betwen animation name and
-    // player is kept here.
+    // animation is kept here.
     CSSAnimations& cssAnimations() { return m_cssAnimations; }
     const CSSAnimations& cssAnimations() const { return m_cssAnimations; }
 
-    // AnimationPlayers which have animations targeting this element.
-    AnimationPlayerCountedSet& players() { return m_players; }
+    // Animations which have effects targeting this element.
+    AnimationCountedSet& animations() { return m_animations; }
 
-    bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.isEmpty() && m_players.isEmpty(); }
+    bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.isEmpty() && m_animations.isEmpty(); }
 
     void restartAnimationOnCompositor();
 
     void updateAnimationFlags(ComputedStyle&);
     void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleChange = animationStyleChange; }
 
     const ComputedStyle* baseComputedStyle() const;
     void updateBaseComputedStyle(const ComputedStyle*);
     void clearBaseComputedStyle();
 
 #if !ENABLE(OILPAN)
-    void addAnimation(Animation* animation) { m_animations.append(animation); }
-    void notifyAnimationDestroyed(Animation* animation) { m_animations.remove(m_animations.find(animation)); }
+    void addEffect(KeyframeEffect* effect) { m_effects.append(effect); }
+    void notifyEffectDestroyed(KeyframeEffect* effect) { m_effects.remove(m_effects.find(effect)); }
 #endif
 
     DECLARE_TRACE();
 
 private:
     bool isAnimationStyleChange() const;
 
     AnimationStack m_defaultStack;
     CSSAnimations m_cssAnimations;
-    AnimationPlayerCountedSet m_players;
+    AnimationCountedSet m_animations;
     bool m_animationStyleChange;
     RefPtr<ComputedStyle> m_baseComputedStyle;
 
 #if !ENABLE(OILPAN)
     // FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements alive
     // and won't be needed once the Node hierarchy becomes traceable.
-    Vector<Animation*> m_animations;
+    Vector<KeyframeEffect*> m_effects;
 #endif
 
     // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style change is due to animation.
     friend class CSSAnimations;
     friend class DeferredLegacyStyleInterpolation;
 };
 
 } // namespace blink
 
 #endif // ElementAnimations_h