Index: Source/core/page/animation/AnimationBase.h |
diff --git a/Source/core/page/animation/AnimationBase.h b/Source/core/page/animation/AnimationBase.h |
index 6b920cad96a7c5f78c034698d33c11fe6990fd22..e408acccc07ef429253062bf57f67f4f795a336e 100644 |
--- a/Source/core/page/animation/AnimationBase.h |
+++ b/Source/core/page/animation/AnimationBase.h |
@@ -29,7 +29,7 @@ |
#ifndef AnimationBase_h |
#define AnimationBase_h |
-#include "Animation.h" |
+#include "PrimitiveAnimation.h" |
#include "CSSPropertyNames.h" |
#include "RenderStyleConstants.h" |
#include <wtf/HashMap.h> |
@@ -53,7 +53,7 @@ class AnimationBase : public RefCounted<AnimationBase> { |
friend class CSSPropertyAnimation; |
public: |
- AnimationBase(const Animation* transition, RenderObject* renderer, CompositeAnimation* compAnim); |
+ AnimationBase(const PrimitiveAnimation* transition, RenderObject* renderer, CompositeAnimation* compAnim); |
virtual ~AnimationBase() { } |
RenderObject* renderer() const { return m_object; } |
@@ -140,9 +140,9 @@ public: |
void fireAnimationEventsIfNeeded(); |
- bool animationsMatch(const Animation*) const; |
+ bool animationsMatch(const PrimitiveAnimation*) const; |
- void setAnimation(const Animation* anim) { m_animation = const_cast<Animation*>(anim); } |
+ void setAnimation(const PrimitiveAnimation* anim) { m_animation = const_cast<PrimitiveAnimation*>(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 |
@@ -181,7 +181,7 @@ public: |
updateStateMachine(AnimationBase::AnimationStateInputStyleAvailable, -1); |
} |
- const Animation* animation() const { return m_animation.get(); } |
+ const PrimitiveAnimation* animation() const { return m_animation.get(); } |
protected: |
virtual void overrideAnimations() { } |
@@ -225,7 +225,7 @@ protected: |
RenderObject* m_object; |
- RefPtr<Animation> m_animation; |
+ RefPtr<PrimitiveAnimation> m_animation; |
CompositeAnimation* m_compAnim; |
}; |