Refactor MutatorHostClient from LayerTreeHost to LayerTree.

cc/trees/layer_tree_host_common_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_common.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 185 matching lines @@
         root_layer->GetLayerTree()->property_trees();
     update_layer_list_.clear();
     PropertyTreeBuilder::BuildPropertyTrees(
         root_layer, page_scale_layer, inner_viewport_scroll_layer,
         outer_viewport_scroll_layer, overscroll_elasticity_layer,
         elastic_overscroll, page_scale_factor, device_scale_factor,
         gfx::Rect(device_viewport_size), gfx::Transform(), property_trees);
     draw_property_utils::UpdatePropertyTrees(property_trees,
                                              can_render_to_separate_surface);
     draw_property_utils::FindLayersThatNeedUpdates(
-        root_layer->layer_tree_host(), property_trees->transform_tree,
+        root_layer->GetLayerTree(), property_trees->transform_tree,
         property_trees->effect_tree, &update_layer_list_);
   }
 
   void ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* root_layer) {
     DCHECK(root_layer->layer_tree_impl());
     PropertyTreeBuilder::PreCalculateMetaInformationForTesting(root_layer);
 
     bool can_render_to_separate_surface = true;
 
     LayerImpl* page_scale_layer = nullptr;
@@ skipping 4653 matching lines @@
   scoped_refptr<Layer> replica_layer = Layer::Create();
 
   grand_child->SetReplicaLayer(replica_layer.get());
   child->AddChild(grand_child.get());
   child->SetMaskLayer(mask_layer.get());
   root->AddChild(child.get());
 
   host()->SetRootLayer(root);
 
   int nonexistent_id = -1;
-  EXPECT_EQ(root.get(), host()->LayerById(root->id()));
-  EXPECT_EQ(child.get(), host()->LayerById(child->id()));
-  EXPECT_EQ(grand_child.get(), host()->LayerById(grand_child->id()));
-  EXPECT_EQ(mask_layer.get(), host()->LayerById(mask_layer->id()));
-  EXPECT_EQ(replica_layer.get(), host()->LayerById(replica_layer->id()));
-  EXPECT_FALSE(host()->LayerById(nonexistent_id));
+  LayerTree* layer_tree = host()->GetLayerTree();
+  EXPECT_EQ(root.get(), layer_tree->LayerById(root->id()));
+  EXPECT_EQ(child.get(), layer_tree->LayerById(child->id()));
+  EXPECT_EQ(grand_child.get(), layer_tree->LayerById(grand_child->id()));
+  EXPECT_EQ(mask_layer.get(), layer_tree->LayerById(mask_layer->id()));
+  EXPECT_EQ(replica_layer.get(), layer_tree->LayerById(replica_layer->id()));
+  EXPECT_FALSE(layer_tree->LayerById(nonexistent_id));
 }
 
 TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) {
   LayerImpl* root = root_layer_for_testing();
   LayerImpl* child = AddChild<LayerImpl>(root);
   LayerImpl* grand_child = AddChild<LayerImpl>(child);
 
   root->SetBounds(gfx::Size(100, 100));
   child->SetBounds(gfx::Size(10, 10));
   child->test_properties()->opacity = 0.5f;
@@ skipping 3419 matching lines @@
 
   root->SetBounds(gfx::Size(100, 100));
   child->SetBounds(gfx::Size(10, 10));
   grandchild->SetBounds(gfx::Size(10, 10));
   greatgrandchild->SetBounds(gfx::Size(10, 10));
 
   root->AddChild(child);
   child->AddChild(grandchild);
   grandchild->AddChild(greatgrandchild);
   host()->SetRootLayer(root);
-  host()->SetElementIdsForTesting();
+  host()->GetLayerTree()->SetElementIdsForTesting();
 
   // Check the non-skipped case.
   ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
   const LayerList* update_list = GetUpdateLayerList();
   EXPECT_TRUE(VerifyLayerInList(grandchild, update_list));
 
   // Now we will reset the visible rect from property trees for the grandchild,
   // and we will configure |child| in several ways that should force the subtree
   // to be skipped. The visible content rect for |grandchild| should, therefore,
   // remain empty.
@@ skipping 1090 matching lines @@
   EXPECT_EQ(property_trees->effect_id_to_index_map.find(child->id()),
             property_trees->effect_id_to_index_map.end());
 }
 
 TEST_F(LayerTreeHostCommonTest, OpacityAnimationsTrackingTest) {
   scoped_refptr<Layer> root = Layer::Create();
   scoped_refptr<LayerWithForcedDrawsContent> animated =
       make_scoped_refptr(new LayerWithForcedDrawsContent());
   root->AddChild(animated);
   host()->SetRootLayer(root);
-  host()->SetElementIdsForTesting();
+  host()->GetLayerTree()->SetElementIdsForTesting();
 
   root->SetBounds(gfx::Size(100, 100));
   root->SetForceRenderSurfaceForTesting(true);
   animated->SetBounds(gfx::Size(20, 20));
   animated->SetOpacity(0.f);
 
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline()->AttachPlayer(player);
 
@@ skipping 28 matching lines @@
   EXPECT_FALSE(node->is_currently_animating_opacity);
   EXPECT_FALSE(node->has_potential_opacity_animation);
 }
 
 TEST_F(LayerTreeHostCommonTest, TransformAnimationsTrackingTest) {
   scoped_refptr<Layer> root = Layer::Create();
   scoped_refptr<LayerWithForcedDrawsContent> animated =
       make_scoped_refptr(new LayerWithForcedDrawsContent());
   root->AddChild(animated);
   host()->SetRootLayer(root);
-  host()->SetElementIdsForTesting();
+  host()->GetLayerTree()->SetElementIdsForTesting();
 
   root->SetBounds(gfx::Size(100, 100));
   root->SetForceRenderSurfaceForTesting(true);
   animated->SetBounds(gfx::Size(20, 20));
 
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline()->AttachPlayer(player);
   player->AttachElement(animated->element_id());
 
@@ skipping 263 matching lines @@
   EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index());
   EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index());
   EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index());
 }
 
 }  // namespace
 }  // namespace cc