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

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

Issue 27030009: Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix build error 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/frame/animation/KeyframeAnimation.cpp
diff --git a/Source/core/frame/animation/KeyframeAnimation.cpp b/Source/core/frame/animation/KeyframeAnimation.cpp
index da94a5836cec263f5b4979c49da9c75fd38d27ad..ad9350892a37527bad22d0c3f9bf726a205529e5 100644
--- a/Source/core/frame/animation/KeyframeAnimation.cpp
+++ b/Source/core/frame/animation/KeyframeAnimation.cpp
@@ -239,7 +239,7 @@ bool KeyframeAnimation::hasAnimationForProperty(CSSPropertyID property) const
void KeyframeAnimation::startAnimation(double timeOffset)
{
- if (m_object && m_object->compositingState() == PaintsIntoOwnBacking)
+ if (m_object && m_object->isComposited())
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->compositingState() == PaintsIntoOwnBacking && isAccelerated())
+ if (m_object && m_object->isComposited() && 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->compositingState() == PaintsIntoOwnBacking && isAccelerated())
+ if (m_object && m_object->isComposited() && isAccelerated())
toRenderBoxModelObject(m_object)->animationFinished(m_keyframes.animationName());
m_isAccelerated = false;
« no previous file with comments | « Source/core/frame/animation/ImplicitAnimation.cpp ('k') | Source/core/inspector/InspectorLayerTreeAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698