| Index: Source/core/page/animation/AnimationBase.h
|
| diff --git a/Source/core/page/animation/AnimationBase.h b/Source/core/page/animation/AnimationBase.h
|
| index 763cee5dddd463a1bdb40b701a54812d67001616..57758b6651089644a5c1e3eb34dd05e09a207313 100644
|
| --- a/Source/core/page/animation/AnimationBase.h
|
| +++ b/Source/core/page/animation/AnimationBase.h
|
| @@ -30,7 +30,7 @@
|
| #define AnimationBase_h
|
|
|
| #include "CSSPropertyNames.h"
|
| -#include "core/platform/animation/CSSAnimationData.h"
|
| +#include "core/platform/animation/StyleAnimationData.h"
|
| #include "core/rendering/style/RenderStyleConstants.h"
|
| #include <wtf/HashMap.h>
|
| #include <wtf/HashSet.h>
|
| @@ -53,7 +53,7 @@ class AnimationBase : public RefCounted<AnimationBase> {
|
| friend class CSSPropertyAnimation;
|
|
|
| public:
|
| - AnimationBase(const CSSAnimationData* transition, RenderObject* renderer, CompositeAnimation* compAnim);
|
| + AnimationBase(const StyleAnimationData* transition, RenderObject* renderer, CompositeAnimation* compAnim);
|
| virtual ~AnimationBase() { }
|
|
|
| RenderObject* renderer() const { return m_object; }
|
| @@ -140,9 +140,9 @@ public:
|
|
|
| void fireAnimationEventsIfNeeded();
|
|
|
| - bool animationsMatch(const CSSAnimationData*) const;
|
| + bool animationsMatch(const StyleAnimationData*) const;
|
|
|
| - void setAnimation(const CSSAnimationData* anim) { m_animation = const_cast<CSSAnimationData*>(anim); }
|
| + void setAnimation(const StyleAnimationData* anim) { m_animation = const_cast<StyleAnimationData*>(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 CSSAnimationData* animation() const { return m_animation.get(); }
|
| + const StyleAnimationData* animation() const { return m_animation.get(); }
|
|
|
| protected:
|
| virtual void overrideAnimations() { }
|
| @@ -225,7 +225,7 @@ protected:
|
|
|
| RenderObject* m_object;
|
|
|
| - RefPtr<CSSAnimationData> m_animation;
|
| + RefPtr<StyleAnimationData> m_animation;
|
| CompositeAnimation* m_compAnim;
|
| };
|
|
|
|
|