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

Unified Diff: Source/core/page/animation/KeyframeAnimation.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: path for re-landing try #2 with removed unnecessary comment Created 7 years, 2 months 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
Index: Source/core/page/animation/KeyframeAnimation.cpp
diff --git a/Source/core/page/animation/KeyframeAnimation.cpp b/Source/core/page/animation/KeyframeAnimation.cpp
index ce6228457ea91a5e1ada6468a75f60b708ed0e4d..e8a24163c53efe08866a1a50391fd58833e8a254 100644
--- a/Source/core/page/animation/KeyframeAnimation.cpp
+++ b/Source/core/page/animation/KeyframeAnimation.cpp
@@ -239,7 +239,7 @@ bool KeyframeAnimation::hasAnimationForProperty(CSSPropertyID property) const
void KeyframeAnimation::startAnimation(double timeOffset)
{
- if (m_object && m_object->isComposited())
+ if (m_object && m_object->compositingState() == PaintsIntoOwnBacking)
m_isAccelerated = toRenderBoxModelObject(m_object)->startAnimation(timeOffset, m_animation.get(), m_keyframes);
}
@@ -248,7 +248,7 @@ void KeyframeAnimation::pauseAnimation(double timeOffset)
if (!m_object)
return;
- if (m_object && m_object->isComposited() && isAccelerated())
+ if (m_object && m_object->compositingState() == PaintsIntoOwnBacking && isAccelerated())
toRenderBoxModelObject(m_object)->animationPaused(timeOffset, m_keyframes.animationName());
// Restore the original (unanimated) style
@@ -261,7 +261,7 @@ void KeyframeAnimation::endAnimation()
if (!m_object)
return;
- if (m_object && m_object->isComposited() && isAccelerated())
+ if (m_object && m_object->compositingState() == PaintsIntoOwnBacking && isAccelerated())
toRenderBoxModelObject(m_object)->animationFinished(m_keyframes.animationName());
m_isAccelerated = false;
« no previous file with comments | « Source/core/page/animation/ImplicitAnimation.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698