Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1303)

Unified Diff: Source/core/platform/animation/CSSAnimationData.cpp

Issue 60033004: Don't check all animation/transition properties when comparing RenderStyles (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/animation/CSSAnimationData.h ('k') | Source/core/platform/animation/TimingFunction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/animation/CSSAnimationData.cpp
diff --git a/Source/core/platform/animation/CSSAnimationData.cpp b/Source/core/platform/animation/CSSAnimationData.cpp
index 886e51584cc6dac8393ed1b3f3637f62a0305406..a3bee6aca2a4a66a4a1b0856a70c1f1fd3a2d4b1 100644
--- a/Source/core/platform/animation/CSSAnimationData.cpp
+++ b/Source/core/platform/animation/CSSAnimationData.cpp
@@ -104,7 +104,7 @@ CSSAnimationData::~CSSAnimationData()
{
}
-bool CSSAnimationData::animationsMatch(const CSSAnimationData* o) const
+bool CSSAnimationData::animationsMatchForStyleRecalc(const CSSAnimationData* o) const
{
if (!o)
return false;
@@ -113,21 +113,9 @@ bool CSSAnimationData::animationsMatch(const CSSAnimationData* o) const
&& 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;
}
« no previous file with comments | « Source/core/platform/animation/CSSAnimationData.h ('k') | Source/core/platform/animation/TimingFunction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698