cc: Merge LayerTree into the LayerTreeHost.

cc/trees/tree_synchronizer.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/tree_synchronizer.h"
 
 #include <stddef.h>
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_collections.h"
 #include "cc/layers/layer_impl.h"
-#include "cc/trees/layer_tree.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
 template <typename LayerTreeType>
 void SynchronizeTreesInternal(LayerTreeType* source_tree,
                               LayerTreeImpl* tree_impl,
                               PropertyTrees* property_trees) {
   DCHECK(tree_impl);
@@ skipping 12 matching lines @@
         &old_layer_map, source_tree->LayerById(id), tree_impl));
     tree_impl->AddLayer(std::move(layer_impl));
   }
 }
 
 void TreeSynchronizer::SynchronizeTrees(Layer* layer_root,
                                         LayerTreeImpl* tree_impl) {
   if (!layer_root) {
     tree_impl->DetachLayers();
   } else {
-    SynchronizeTreesInternal(layer_root->GetLayerTree(), tree_impl,
-                             layer_root->GetLayerTree()->property_trees());
+    SynchronizeTreesInternal(layer_root->layer_tree_host(), tree_impl,
+                             layer_root->layer_tree_host()->property_trees());
   }
 }
 
 void TreeSynchronizer::SynchronizeTrees(LayerTreeImpl* pending_tree,
                                         LayerTreeImpl* active_tree) {
   if (pending_tree->LayerListIsEmpty()) {
     active_tree->DetachLayers();
   } else {
     SynchronizeTreesInternal(pending_tree, active_tree,
                              pending_tree->property_trees());
@@ skipping 37 matching lines @@
     layer->PushPropertiesTo(layer_impl);
   }
 }
 
 void TreeSynchronizer::PushLayerProperties(LayerTreeImpl* pending_tree,
                                            LayerTreeImpl* active_tree) {
   PushLayerPropertiesInternal(pending_tree->LayersThatShouldPushProperties(),
                               active_tree);
 }
 
-void TreeSynchronizer::PushLayerProperties(LayerTree* host_tree,
+void TreeSynchronizer::PushLayerProperties(LayerTreeHost* host_tree,
                                            LayerTreeImpl* impl_tree) {
   PushLayerPropertiesInternal(host_tree->LayersThatShouldPushProperties(),
                               impl_tree);
 }
 
 }  // namespace cc