Web Animations: Update naming to reflect spec changes

Source/core/animation/KeyframeEffect.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 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 Animation_h
-#define Animation_h
+#ifndef KeyframeEffect_h
+#define KeyframeEffect_h
 
 #include "core/CoreExport.h"
 #include "core/animation/AnimationEffect.h"
-#include "core/animation/AnimationNode.h"
 #include "core/animation/EffectInput.h"
+#include "core/animation/EffectModel.h"
 #include "core/animation/TimingInput.h"
 #include "platform/heap/Handle.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
-class AnimationTimingProperties;
+class KeyframeEffectOptions;
 class Dictionary;
 class Element;
 class ExceptionState;
 class PropertyHandle;
 class SampledEffect;
 
-class CORE_EXPORT Animation final : public AnimationNode {
+class CORE_EXPORT KeyframeEffect final : public AnimationEffect {
     DEFINE_WRAPPERTYPEINFO();
 public:
     enum Priority { DefaultPriority, TransitionPriority };
 
-    static PassRefPtrWillBeRawPtr<Animation> create(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtrWillBeRawPtr<EventDelegate> = nullptr);
+    static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority = DefaultPriority, PassOwnPtrWillBeRawPtr<EventDelegate> = nullptr);
     // Web Animations API Bindings constructors.
-    static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
-    static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const AnimationTimingProperties& timingInput, ExceptionState&);
-    static PassRefPtrWillBeRawPtr<Animation> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
+    static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState&);
+    static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, const KeyframeEffectOptions& timingInput, ExceptionState&);
+    static PassRefPtrWillBeRawPtr<KeyframeEffect> create(Element*, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState&);
 
-    virtual ~Animation();
+    virtual ~KeyframeEffect();
 
     virtual bool isAnimation() const override { return true; }
 
     bool affects(PropertyHandle) const;
-    const AnimationEffect* effect() const { return m_effect.get(); }
-    AnimationEffect* effect() { return m_effect.get(); }
-    void setEffect(PassRefPtrWillBeRawPtr<AnimationEffect> effect) { m_effect = effect; }
+    const EffectModel* effect() const { return m_effect.get(); }
+    EffectModel* effect() { return m_effect.get(); }
+    void setEffect(PassRefPtrWillBeRawPtr<EffectModel> effect) { m_effect = effect; }
     Priority priority() const { return m_priority; }
     Element* target() const { return m_target; }
 
 #if !ENABLE(OILPAN)
     void notifyElementDestroyed();
 #endif
 
-    bool isCandidateForAnimationOnCompositor(double playerPlaybackRate) const;
+    bool isCandidateForAnimationOnCompositor(double animationPlaybackRate) const;
     // Must only be called once.
-    bool maybeStartAnimationOnCompositor(int group, double startTime, double timeOffset, double playerPlaybackRate);
+    bool maybeStartAnimationOnCompositor(int group, double startTime, double timeOffset, double animationPlaybackRate);
     bool hasActiveAnimationsOnCompositor() const;
     bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
     bool cancelAnimationOnCompositor();
     void restartAnimationOnCompositor();
     void cancelIncompatibleAnimationsOnCompositor();
     void pauseAnimationForTestingOnCompositor(double pauseTime);
 
     bool canAttachCompositedLayers() const;
     void attachCompositedLayers();
 
     void setCompositorAnimationIdsForTesting(const Vector<int>& compositorAnimationIds) { m_compositorAnimationIds = compositorAnimationIds; }
 
     DECLARE_VIRTUAL_TRACE();
 
     void downgradeToNormalAnimation() { m_priority = DefaultPriority; }

[alancutter (OOO until 2018), 2015/05/05 01:04:51]

s/Animation//

[dstockwell, 2015/05/05 03:33:25]

Done.

 
 protected:
     void applyEffects();
     void clearEffects();
     virtual void updateChildrenAndEffects() const override;
-    virtual void attach(AnimationPlayer*) override;
+    virtual void attach(Animation*) override;
     virtual void detach() override;
     virtual void specifiedTimingChanged() override;
     virtual double calculateTimeToEffectChange(bool forwards, double inheritedTime, double timeToNextIteration) const override;
 
 private:
-    Animation(Element*, PassRefPtrWillBeRawPtr<AnimationEffect>, const Timing&, Priority, PassOwnPtrWillBeRawPtr<EventDelegate>);
+    KeyframeEffect(Element*, PassRefPtrWillBeRawPtr<EffectModel>, const Timing&, Priority, PassOwnPtrWillBeRawPtr<EventDelegate>);
 
     RawPtrWillBeMember<Element> m_target;
-    RefPtrWillBeMember<AnimationEffect> m_effect;
+    RefPtrWillBeMember<EffectModel> m_effect;
     RawPtrWillBeMember<SampledEffect> m_sampledEffect;
 
     Priority m_priority;
 
     Vector<int> m_compositorAnimationIds;
 
     friend class AnimationAnimationV8Test;
 };
 
-DEFINE_TYPE_CASTS(Animation, AnimationNode, animationNode, animationNode->isAnimation(), animationNode.isAnimation());
+DEFINE_TYPE_CASTS(KeyframeEffect, AnimationEffect, animationNode, animationNode->isAnimation(), animationNode.isAnimation());
 
 } // namespace blink
 
-#endif // Animation_h
+#endif // KeyframeEffect_h