Rename Animation -> PrimitiveAnimation

Source/core/page/animation/AnimationBase.h

 /*
  * Copyright (C) 2007 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * 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 AnimationBase_h
 #define AnimationBase_h
 
 #include "CSSPropertyNames.h"
-#include "core/platform/animation/Animation.h"
+#include "core/platform/animation/CSSAnimationData.h"
 #include "core/rendering/style/RenderStyleConstants.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
 
 class AnimationBase;
 class AnimationController;
 class CompositeAnimation;
 class Element;
 class Node;
 class RenderObject;
 class RenderStyle;
 class TimingFunction;
 
 class AnimationBase : public RefCounted<AnimationBase> {
     friend class CompositeAnimation;
     friend class CSSPropertyAnimation;
 
 public:
-    AnimationBase(const Animation* transition, RenderObject* renderer, CompositeAnimation* compAnim);
+    AnimationBase(const CSSAnimationData* transition, RenderObject* renderer, CompositeAnimation* compAnim);
     virtual ~AnimationBase() { }
 
     RenderObject* renderer() const { return m_object; }
     void clear()
     {
       endAnimation();
       m_object = 0;
       m_compAnim = 0;
     }
 
@@ skipping 66 matching lines @@
 
     double progress(double scale, double offset, const TimingFunction*) const;
 
     virtual void animate(CompositeAnimation*, RenderObject*, const RenderStyle* /*currentStyle*/, RenderStyle* /*targetStyle*/, RefPtr<RenderStyle>& /*animatedStyle*/) = 0;
     virtual void getAnimatedStyle(RefPtr<RenderStyle>& /*animatedStyle*/) = 0;
 
     virtual bool shouldFireEvents() const { return false; }
 
     void fireAnimationEventsIfNeeded();
 
-    bool animationsMatch(const Animation*) const;
+    bool animationsMatch(const CSSAnimationData*) const;
 
-    void setAnimation(const Animation* anim) { m_animation = const_cast<Animation*>(anim); }
+    void setAnimation(const CSSAnimationData* anim) { m_animation = const_cast<CSSAnimationData*>(anim); }
 
     // Return true if this animation is overridden. This will only be the case for
     // ImplicitAnimations and is used to determine whether or not we should force
     // set the start time. If an animation is overridden, it will probably not get
     // back the AnimationStateInputStartTimeSet input.
     virtual bool overridden() const { return false; }
 
     // Does this animation/transition involve the given property?
     virtual bool affectsProperty(CSSPropertyID /*property*/) const { return false; }
 
@@ skipping 18 matching lines @@
     double beginAnimationUpdateTime() const;
 
     double getElapsedTime() const;
 
     void styleAvailable() 
     {
         ASSERT(waitingForStyleAvailable());
         updateStateMachine(AnimationBase::AnimationStateInputStyleAvailable, -1);
     }
 
-    const Animation* animation() const { return m_animation.get(); }
+    const CSSAnimationData* animation() const { return m_animation.get(); }
 
 protected:
     virtual void overrideAnimations() { }
     virtual void resumeOverriddenAnimations() { }
 
     CompositeAnimation* compositeAnimation() { return m_compAnim; }
 
     // These are called when the corresponding timer fires so subclasses can do any extra work
     virtual void onAnimationStart(double /*elapsedTime*/) { }
     virtual void onAnimationIteration(double /*elapsedTime*/) { }
@@ skipping 23 matching lines @@
     bool m_filterFunctionListsMatch;
     double m_startTime;
     double m_pauseTime;
     double m_requestedStartTime;
 
     double m_totalDuration;
     double m_nextIterationDuration;
 
     RenderObject* m_object;
 
-    RefPtr<Animation> m_animation;
+    RefPtr<CSSAnimationData> m_animation;
     CompositeAnimation* m_compAnim;
 };
 
 } // namespace WebCore
 
 #endif // AnimationBase_h