Index: Source/core/platform/animation/CSSAnimationData.cpp |
diff --git a/Source/core/platform/animation/CSSAnimationData.cpp b/Source/core/platform/animation/CSSAnimationData.cpp |
index 65f2fa6290b9683d41b712700aaf840d930a7f56..886e51584cc6dac8393ed1b3f3637f62a0305406 100644 |
--- a/Source/core/platform/animation/CSSAnimationData.cpp |
+++ b/Source/core/platform/animation/CSSAnimationData.cpp |
@@ -104,34 +104,31 @@ CSSAnimationData::~CSSAnimationData() |
{ |
} |
-bool CSSAnimationData::animationsMatch(const CSSAnimationData* o, bool matchPlayStates) const |
+bool CSSAnimationData::animationsMatch(const CSSAnimationData* o) const |
{ |
if (!o) |
return false; |
- bool result = m_name == o->m_name |
- && m_property == o->m_property |
- && m_mode == o->m_mode |
- && m_iterationCount == o->m_iterationCount |
- && m_delay == o->m_delay |
- && m_duration == o->m_duration |
- && *(m_timingFunction.get()) == *(o->m_timingFunction.get()) |
- && m_direction == o->m_direction |
- && m_fillMode == o->m_fillMode |
- && m_delaySet == o->m_delaySet |
- && m_directionSet == o->m_directionSet |
- && m_durationSet == o->m_durationSet |
- && m_fillModeSet == o->m_fillModeSet |
- && m_iterationCountSet == o->m_iterationCountSet |
- && m_nameSet == o->m_nameSet |
- && m_propertySet == o->m_propertySet |
- && m_timingFunctionSet == o->m_timingFunctionSet |
- && m_isNone == o->m_isNone; |
- |
- if (!result) |
- return false; |
- |
- return !matchPlayStates || (m_playState == o->m_playState && m_playStateSet == o->m_playStateSet); |
+ return m_name == o->m_name |
+ && m_playState == o->m_playState |
+ && m_property == o->m_property |
+ && m_mode == o->m_mode |
+ && m_iterationCount == o->m_iterationCount |
+ && m_delay == o->m_delay |
+ && m_duration == o->m_duration |
+ && *(m_timingFunction.get()) == *(o->m_timingFunction.get()) |
+ && m_direction == o->m_direction |
+ && m_fillMode == o->m_fillMode |
+ && m_delaySet == o->m_delaySet |
+ && m_directionSet == o->m_directionSet |
+ && m_durationSet == o->m_durationSet |
+ && m_fillModeSet == o->m_fillModeSet |
+ && m_iterationCountSet == o->m_iterationCountSet |
+ && m_nameSet == o->m_nameSet |
+ && m_playStateSet == o->m_playStateSet |
+ && m_propertySet == o->m_propertySet |
+ && m_timingFunctionSet == o->m_timingFunctionSet |
+ && m_isNone == o->m_isNone; |
} |
const String& CSSAnimationData::initialAnimationName() |