cc: Make LayerTreeHost a protected Layer member.

cc/trees/layer_tree.cc

 // Copyright 2016 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.h"
 
 #include "base/auto_reset.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_host.h"
 #include "cc/input/page_scale_animation.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_proto_converter.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/layer_tree.pb.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_impl.h"
+#include "cc/trees/property_tree_builder.h"
 
 namespace cc {
 
 namespace {
 
 Layer* UpdateAndGetLayer(Layer* current_layer,
                          int layer_id,
                          LayerTree* layer_tree) {
   if (layer_id == Layer::INVALID_ID) {
     if (current_layer)
@@ skipping 288 matching lines @@
   needs_meta_info_recomputation_ = true;
 
   property_trees_.needs_rebuild = true;
   SetNeedsCommit();
 }
 
 void LayerTree::SetNeedsCommit() {
   layer_tree_host_->SetNeedsCommit();
 }
 
+const LayerTreeSettings& LayerTree::GetSettings() const {
+  return layer_tree_host_->GetSettings();
+}
+
 void LayerTree::SetPropertyTreesNeedRebuild() {
   property_trees_.needs_rebuild = true;
   layer_tree_host_->SetNeedsUpdateLayers();
 }
 
 void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl) {
   tree_impl->set_needs_full_tree_sync(needs_full_tree_sync_);
   needs_full_tree_sync_ = false;
 
   if (hud_layer_.get()) {
@@ skipping 236 matching lines @@
 }
 
 static void SetElementIdForTesting(Layer* layer) {
   layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
 }
 
 void LayerTree::SetElementIdsForTesting() {
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, SetElementIdForTesting);
 }
 
+void LayerTree::BuildPropertyTreesForTesting() {
+  PropertyTreeBuilder::PreCalculateMetaInformation(root_layer());
+  gfx::Transform identity_transform;
+  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()), identity_transform, property_trees());
+}
+
 bool LayerTree::IsElementInList(ElementId element_id,
                                 ElementListType list_type) const {
   return list_type == ElementListType::ACTIVE && LayerByElementId(element_id);
 }
 
 void LayerTree::SetMutatorsNeedCommit() {
   layer_tree_host_->SetNeedsCommit();
 }
 
 void LayerTree::SetMutatorsNeedRebuildPropertyTrees() {
@@ skipping 120 matching lines @@
 LayerListReverseIterator<Layer> LayerTree::rend() {
   return LayerListReverseIterator<Layer>(nullptr);
 }
 
 void LayerTree::SetNeedsDisplayOnAllLayers() {
   for (auto* layer : *this)
     layer->SetNeedsDisplay();
 }
 
 }  // namespace cc