| 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;
|
| }
|
|
|