| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| index 67b15bf055fd488ca9b9d8fa72270684089c0bf5..f46fdf6c0a8760b30b0c7c3d6764238c31d21e72 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| @@ -29,6 +29,7 @@
|
| #include "platform/animation/CompositorAnimationPlayerClient.h"
|
| #include "platform/animation/CompositorAnimationTimeline.h"
|
| #include "platform/animation/CompositorFloatAnimationCurve.h"
|
| +#include "platform/graphics/CompositorElementId.h"
|
| #include "platform/graphics/CompositorFactory.h"
|
| #include "platform/scroll/ScrollableArea.h"
|
| #include "platform/testing/FakeGraphicsLayer.h"
|
| @@ -115,8 +116,10 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
|
| layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
|
| compositorTimeline->playerAttached(player);
|
|
|
| - player.compositorPlayer()->attachLayer(m_platformLayer);
|
| - ASSERT_TRUE(player.compositorPlayer()->isLayerAttached());
|
| + m_platformLayer->setElementId(CompositorElementId(m_platformLayer->id()));
|
| +
|
| + player.compositorPlayer()->attachElement(m_platformLayer->elementId());
|
| + ASSERT_TRUE(player.compositorPlayer()->isElementAttached());
|
|
|
| player.compositorPlayer()->addAnimation(floatAnimation.leakPtr());
|
|
|
| @@ -138,8 +141,8 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
|
|
|
| ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
|
|
|
| - player.compositorPlayer()->detachLayer();
|
| - ASSERT_FALSE(player.compositorPlayer()->isLayerAttached());
|
| + player.compositorPlayer()->detachElement();
|
| + ASSERT_FALSE(player.compositorPlayer()->isElementAttached());
|
|
|
| compositorTimeline->playerDestroyed(player);
|
| layerTreeView()->detachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
|
|
|