| Index: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| index fd3f332118dd73fa4655720c2944f46a511938ed..8c373f2e720204956355dfbecc90f4a9cc10f8bd 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| @@ -391,41 +391,6 @@ void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& e
|
| compositorPlayer->pauseAnimation(id, pauseTime);
|
| }
|
|
|
| -bool CompositorAnimations::canAttachCompositedLayers(const Element& element, const Animation& animation)
|
| -{
|
| - if (!animation.compositorPlayer())
|
| - return false;
|
| -
|
| - if (!element.layoutObject() || !element.layoutObject()->isBoxModelObject())
|
| - return false;
|
| -
|
| - PaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
|
| -
|
| - if (!layer || !layer->isAllowedToQueryCompositingState()
|
| - || !layer->compositedLayerMapping()
|
| - || !layer->compositedLayerMapping()->mainGraphicsLayer())
|
| - return false;
|
| -
|
| - if (!layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer())
|
| - return false;
|
| -
|
| - return true;
|
| -}
|
| -
|
| -void CompositorAnimations::attachCompositedLayers(const Element& element, const Animation& animation)
|
| -{
|
| - ASSERT(element.layoutObject());
|
| -
|
| - PaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
|
| - ASSERT(layer);
|
| -
|
| - CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
|
| - ASSERT(compositorPlayer);
|
| -
|
| - ASSERT(layer->compositedLayerMapping());
|
| - compositorPlayer->attachLayer(layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer());
|
| -}
|
| -
|
| // -----------------------------------------------------------------------
|
| // CompositorAnimationsImpl
|
| // -----------------------------------------------------------------------
|
|
|