| Index: Source/core/animation/CompositorAnimations.cpp
|
| diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp
|
| index 89d2a03636571c29a0d19821e59c6095898e0096..1ceaec76a540e44a3c8c1fb28615245c7a3961d4 100644
|
| --- a/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/Source/core/animation/CompositorAnimations.cpp
|
| @@ -40,9 +40,9 @@
|
| #include "core/animation/animatable/AnimatableTransform.h"
|
| #include "core/animation/animatable/AnimatableValue.h"
|
| #include "core/layout/Layer.h"
|
| +#include "core/layout/LayoutBoxModelObject.h"
|
| #include "core/layout/LayoutObject.h"
|
| #include "core/layout/compositing/CompositedLayerMapping.h"
|
| -#include "core/rendering/RenderBoxModelObject.h"
|
| #include "platform/geometry/FloatBox.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebCompositorAnimation.h"
|
| @@ -268,7 +268,7 @@ bool CompositorAnimations::startAnimationOnCompositor(const Element& element, in
|
|
|
| const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
|
|
|
| - Layer* layer = toRenderBoxModelObject(element.renderer())->layer();
|
| + Layer* layer = toLayoutBoxModelObject(element.renderer())->layer();
|
| ASSERT(layer);
|
|
|
| Vector<OwnPtr<WebCompositorAnimation>> animations;
|
| @@ -299,7 +299,7 @@ void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, i
|
| // compositing update.
|
| return;
|
| }
|
| - toRenderBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
|
| + toLayoutBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
|
| }
|
|
|
| void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& element, int id, double pauseTime)
|
| @@ -312,7 +312,7 @@ void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& e
|
| ASSERT_NOT_REACHED();
|
| return;
|
| }
|
| - toRenderBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
|
| + toLayoutBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
|
| }
|
|
|
| // -----------------------------------------------------------------------
|
|
|