| Index: Source/core/platform/animation/PrimitiveAnimation.cpp
|
| diff --git a/Source/core/platform/animation/Animation.cpp b/Source/core/platform/animation/PrimitiveAnimation.cpp
|
| similarity index 89%
|
| rename from Source/core/platform/animation/Animation.cpp
|
| rename to Source/core/platform/animation/PrimitiveAnimation.cpp
|
| index 333f1d828434930208620f7b76c0cf63c3df9b38..f837733da68d200b03cca745c7d7918c23d775c6 100644
|
| --- a/Source/core/platform/animation/Animation.cpp
|
| +++ b/Source/core/platform/animation/PrimitiveAnimation.cpp
|
| @@ -20,11 +20,11 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "Animation.h"
|
| +#include "PrimitiveAnimation.h"
|
|
|
| namespace WebCore {
|
|
|
| -Animation::Animation()
|
| +PrimitiveAnimation::PrimitiveAnimation()
|
| : m_name(initialAnimationName())
|
| , m_property(CSSPropertyInvalid)
|
| , m_mode(AnimateAll)
|
| @@ -48,8 +48,8 @@ Animation::Animation()
|
| {
|
| }
|
|
|
| -Animation::Animation(const Animation& o)
|
| - : RefCounted<Animation>()
|
| +PrimitiveAnimation::PrimitiveAnimation(const PrimitiveAnimation& o)
|
| + : RefCounted<PrimitiveAnimation>()
|
| , m_name(o.m_name)
|
| , m_property(o.m_property)
|
| , m_mode(o.m_mode)
|
| @@ -73,7 +73,7 @@ Animation::Animation(const Animation& o)
|
| {
|
| }
|
|
|
| -Animation& Animation::operator=(const Animation& o)
|
| +PrimitiveAnimation& PrimitiveAnimation::operator=(const PrimitiveAnimation& o)
|
| {
|
| m_name = o.m_name;
|
| m_property = o.m_property;
|
| @@ -100,17 +100,17 @@ Animation& Animation::operator=(const Animation& o)
|
| return *this;
|
| }
|
|
|
| -Animation::~Animation()
|
| +PrimitiveAnimation::~PrimitiveAnimation()
|
| {
|
| }
|
|
|
| -bool Animation::animationsMatch(const Animation* o, bool matchPlayStates) const
|
| +bool PrimitiveAnimation::animationsMatch(const PrimitiveAnimation* o, bool matchPlayStates) const
|
| {
|
| if (!o)
|
| return false;
|
| -
|
| +
|
| bool result = m_name == o->m_name
|
| - && m_property == o->m_property
|
| + && m_property == o->m_property
|
| && m_mode == o->m_mode
|
| && m_iterationCount == o->m_iterationCount
|
| && m_delay == o->m_delay
|
| @@ -134,7 +134,7 @@ bool Animation::animationsMatch(const Animation* o, bool matchPlayStates) const
|
| return !matchPlayStates || (m_playState == o->m_playState && m_playStateSet == o->m_playStateSet);
|
| }
|
|
|
| -const String& Animation::initialAnimationName()
|
| +const String& PrimitiveAnimation::initialAnimationName()
|
| {
|
| DEFINE_STATIC_LOCAL(String, initialValue, (ASCIILiteral("none")));
|
| return initialValue;
|
|
|