| Index: third_party/WebKit/Source/core/animation/Animation.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/Animation.cpp b/third_party/WebKit/Source/core/animation/Animation.cpp
|
| index 604c16bfd893e5be300256b3b0f552607a6846b4..47698978a4961ac229d87eda6788ff8acddf2c6b 100644
|
| --- a/third_party/WebKit/Source/core/animation/Animation.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/Animation.cpp
|
| @@ -949,13 +949,14 @@
|
| ASSERT(m_content);
|
| ASSERT(m_content->isKeyframeEffect());
|
|
|
| - toKeyframeEffect(m_content.get())->attachCompositedLayers();
|
| + if (toKeyframeEffect(m_content.get())->canAttachCompositedLayers())
|
| + toKeyframeEffect(m_content.get())->attachCompositedLayers();
|
| }
|
|
|
| void Animation::detachCompositedLayers()
|
| {
|
| - if (m_compositorPlayer && m_compositorPlayer->isElementAttached())
|
| - m_compositorPlayer->detachElement();
|
| + if (m_compositorPlayer && m_compositorPlayer->isLayerAttached())
|
| + m_compositorPlayer->detachLayer();
|
| }
|
|
|
| void Animation::notifyAnimationStarted(double monotonicTime, int group)
|
|
|