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

Unified Diff: Source/core/frame/animation/ImplicitAnimation.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
« no previous file with comments | « Source/core/frame/animation/AnimationBase.cpp ('k') | Source/core/frame/animation/KeyframeAnimation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/animation/ImplicitAnimation.cpp
diff --git a/Source/core/frame/animation/ImplicitAnimation.cpp b/Source/core/frame/animation/ImplicitAnimation.cpp
index 87f29e0100648566603f2fc3b7927e2c46d370f7..37c74d0247a8b04211d869b76827b95a6ded6ae0 100644
--- a/Source/core/frame/animation/ImplicitAnimation.cpp
+++ b/Source/core/frame/animation/ImplicitAnimation.cpp
@@ -104,7 +104,7 @@ void ImplicitAnimation::getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle)
void ImplicitAnimation::startAnimation(double timeOffset)
{
- if (m_object && m_object->compositingState() == PaintsIntoOwnBacking)
+ if (m_object && m_object->isComposited())
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->compositingState() == PaintsIntoOwnBacking && isAccelerated())
+ if (m_object && m_object->isComposited() && 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->compositingState() == PaintsIntoOwnBacking && isAccelerated())
+ if (m_object && m_object->isComposited() && isAccelerated())
toRenderBoxModelObject(m_object)->transitionFinished(m_animatingProperty);
m_isAccelerated = false;
}
« no previous file with comments | « Source/core/frame/animation/AnimationBase.cpp ('k') | Source/core/frame/animation/KeyframeAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698