| Index: cc/trees/layer_tree_host_unittest_occlusion.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc
|
| index 6d47b1599675e7bd2fbd58aa318a0f9f486a19de..fea056ef111a5f8024dd7dcdade390a2414c687e 100644
|
| --- a/cc/trees/layer_tree_host_unittest_occlusion.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_occlusion.cc
|
| @@ -48,7 +48,7 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnLayer
|
| void BeginTest() override { PostSetNeedsCommitToMainThread(); }
|
|
|
| void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
|
| - LayerImpl* root = impl->active_tree()->root_layer();
|
| + LayerImpl* root = impl->active_tree()->root_layer_for_testing();
|
| LayerImpl* child = impl->active_tree()->LayerById(child_->id());
|
|
|
| // Verify the draw properties are valid.
|
| @@ -104,7 +104,7 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnSurface
|
| void BeginTest() override { PostSetNeedsCommitToMainThread(); }
|
|
|
| void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
|
| - LayerImpl* root = impl->active_tree()->root_layer();
|
| + LayerImpl* root = impl->active_tree()->root_layer_for_testing();
|
| LayerImpl* child = impl->active_tree()->LayerById(child_->id());
|
| RenderSurfaceImpl* surface = child->render_surface();
|
|
|
| @@ -171,7 +171,7 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnMask
|
| void BeginTest() override { PostSetNeedsCommitToMainThread(); }
|
|
|
| void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
|
| - LayerImpl* root = impl->active_tree()->root_layer();
|
| + LayerImpl* root = impl->active_tree()->root_layer_for_testing();
|
| LayerImpl* child = impl->active_tree()->LayerById(child_->id());
|
| RenderSurfaceImpl* surface = child->render_surface();
|
| LayerImpl* mask = surface->MaskLayer();
|
| @@ -312,7 +312,7 @@ class LayerTreeHostOcclusionTestDrawPropertiesInsideReplica
|
| void BeginTest() override { PostSetNeedsCommitToMainThread(); }
|
|
|
| void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
|
| - LayerImpl* root = impl->active_tree()->root_layer();
|
| + LayerImpl* root = impl->active_tree()->root_layer_for_testing();
|
| LayerImpl* child = impl->active_tree()->LayerById(child_->id());
|
| RenderSurfaceImpl* surface = child->render_surface();
|
| LayerImpl* mask = surface->MaskLayer();
|
|
|