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

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

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed second round of reviewer feedback 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/ImplicitAnimation.cpp
diff --git a/Source/core/page/animation/ImplicitAnimation.cpp b/Source/core/page/animation/ImplicitAnimation.cpp
index dc1ce8d06f0f629df7a71c3954e2ba292629c8ae..68e353470d1a9abe167e8cdce815dcf88b6ecdda 100644
--- a/Source/core/page/animation/ImplicitAnimation.cpp
+++ b/Source/core/page/animation/ImplicitAnimation.cpp
@@ -104,7 +104,7 @@ void ImplicitAnimation::getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle)
void ImplicitAnimation::startAnimation(double timeOffset)
{
- if (m_object && m_object->isComposited())
+ if (m_object && m_object->compositingState() == PaintsIntoOwnBacking)
m_isAccelerated = toRenderBoxModelObject(m_object)->startTransition(timeOffset, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
}
@@ -113,7 +113,7 @@ void ImplicitAnimation::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)->transitionPaused(timeOffset, m_animatingProperty);
// Restore the original (unanimated) style
@@ -123,7 +123,7 @@ void ImplicitAnimation::pauseAnimation(double timeOffset)
void ImplicitAnimation::endAnimation()
{
- if (m_object && m_object->isComposited() && isAccelerated())
+ if (m_object && m_object->compositingState() == PaintsIntoOwnBacking && isAccelerated())
toRenderBoxModelObject(m_object)->transitionFinished(m_animatingProperty);
m_isAccelerated = false;
}

Powered by Google App Engine
This is Rietveld 408576698