| Index: third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
|
| index 48697de52d427507fe4e0fe5c719f3a9c2419133..10b26baf120b75ac17b1aaee3e3a1ba7f18f6f4a 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp
|
| @@ -52,7 +52,7 @@ public:
|
|
|
| FakeLayerTreeHostImpl& hostImpl() { return *m_hostImpl; }
|
|
|
| - LayerImpl* rootLayer() { return m_hostImpl->active_tree()->root_layer(); }
|
| + LayerImpl* rootLayer() { return m_hostImpl->active_tree()->root_layer_for_testing(); }
|
|
|
| private:
|
| // The cc testing machinery has fairly deep dependency on having a main
|
| @@ -74,7 +74,7 @@ TEST_F(CompositorMutableStateTest, NoMutableState)
|
| SetLayerPropertiesForTesting(root.get());
|
|
|
| hostImpl().SetViewportSize(root->bounds());
|
| - hostImpl().active_tree()->SetRootLayer(std::move(root));
|
| + hostImpl().active_tree()->SetRootLayerForTesting(std::move(root));
|
| hostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
|
|
|
| CompositorMutations mutations;
|
| @@ -92,7 +92,7 @@ TEST_F(CompositorMutableStateTest, MutableStateNoMutableProperties)
|
| root->SetElementId(42);
|
|
|
| hostImpl().SetViewportSize(root->bounds());
|
| - hostImpl().active_tree()->SetRootLayer(std::move(root));
|
| + hostImpl().active_tree()->SetRootLayerForTesting(std::move(root));
|
| hostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
|
|
|
| CompositorMutations mutations;
|
| @@ -123,7 +123,7 @@ TEST_F(CompositorMutableStateTest, MutableStateMutableProperties)
|
| layer->SetMutableProperties(CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop);
|
|
|
| hostImpl().SetViewportSize(layer->bounds());
|
| - hostImpl().active_tree()->SetRootLayer(std::move(root));
|
| + hostImpl().active_tree()->SetRootLayerForTesting(std::move(root));
|
| hostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
|
|
|
| CompositorMutations mutations;
|
|
|