cc: Move main thread hierarchy dependencies into PropertyTreeBuilder

cc/test/layer_tree_host_common_test.cc

 // Copyright 2014 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/test/layer_tree_host_common_test.h"
 
 #include <stddef.h>
 
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 56 matching lines @@
   }
 }
 
 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
     Layer* root_layer,
     float device_scale_factor,
     float page_scale_factor,
     Layer* page_scale_layer,
     bool can_use_lcd_text,
     bool layers_always_allowed_lcd_text) {
-  LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
+  PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
 
   EXPECT_TRUE(page_scale_layer || (page_scale_factor == 1.f));
   gfx::Transform identity_matrix;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width() * device_scale_factor,
                 root_layer->bounds().height() * device_scale_factor);
 
   // We are probably not testing what is intended if the root_layer bounds are
   // empty.
   DCHECK(!root_layer->bounds().IsEmpty());
   LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
       root_layer, device_viewport_size);
   inputs.device_scale_factor = device_scale_factor;
   inputs.page_scale_factor = page_scale_factor;
   inputs.page_scale_layer = page_scale_layer;
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 }
 
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) {
   DCHECK(root_layer->layer_tree_host());
-  LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
+  PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
 
   gfx::Transform identity_transform;
 
   bool can_render_to_separate_surface = true;
 
   const Layer* page_scale_layer =
       root_layer->layer_tree_host()->page_scale_layer();
   Layer* inner_viewport_scroll_layer =
       root_layer->layer_tree_host()->inner_viewport_scroll_layer();
   Layer* outer_viewport_scroll_layer =
@@ skipping 21 matching lines @@
   draw_property_utils::FindLayersThatNeedUpdates(
       root_layer->layer_tree_host(), property_trees->transform_tree,
       property_trees->effect_tree, &update_layer_list_);
   draw_property_utils::ComputeVisibleRectsForTesting(
       property_trees, can_render_to_separate_surface, &update_layer_list_);
 }
 
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* root_layer) {
   DCHECK(root_layer->layer_tree_impl());
-  LayerTreeHostCommon::PreCalculateMetaInformationForTesting(root_layer);
+  PropertyTreeBuilder::PreCalculateMetaInformationForTesting(root_layer);
 
   gfx::Transform identity_transform;
 
   bool can_render_to_separate_surface = true;
 
   LayerImpl* page_scale_layer = nullptr;
   LayerImpl* inner_viewport_scroll_layer =
       root_layer->layer_tree_impl()->InnerViewportScrollLayer();
   LayerImpl* outer_viewport_scroll_layer =
       root_layer->layer_tree_impl()->OuterViewportScrollLayer();
@@ skipping 39 matching lines @@
   DCHECK(!root_layer->bounds().IsEmpty());
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_layer, device_viewport_size, render_surface_layer_list_impl_.get());
   inputs.device_scale_factor = device_scale_factor;
   inputs.page_scale_factor = page_scale_factor;
   inputs.page_scale_layer = page_scale_layer;
   inputs.can_use_lcd_text = can_use_lcd_text;
   inputs.layers_always_allowed_lcd_text = layers_always_allowed_lcd_text;
   inputs.can_adjust_raster_scales = true;
 
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 }
 
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithoutSeparateSurfaces(
         LayerImpl* root_layer) {
   gfx::Transform identity_matrix;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width(), root_layer->bounds().height());
   render_surface_layer_list_impl_.reset(new LayerImplList);
 
   DCHECK(!root_layer->bounds().IsEmpty());
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_layer, device_viewport_size, render_surface_layer_list_impl_.get());
   inputs.can_adjust_raster_scales = true;
   inputs.can_render_to_separate_surface = false;
 
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 }
 
 bool LayerTreeHostCommonTestBase::UpdateLayerListContains(int id) const {
   for (size_t i = 0; i < update_layer_list_.size(); ++i) {
     if (update_layer_list_[i]->id() == id)
       return true;
   }
   return false;
 }
 
 LayerTreeHostCommonTest::LayerTreeHostCommonTest()
     : LayerTreeHostCommonTestBase(LayerTreeSettings()) {}
 
 LayerTreeHostCommonTest::LayerTreeHostCommonTest(
     const LayerTreeSettings& settings)
     : LayerTreeHostCommonTestBase(settings) {
 }
 
 }  // namespace cc