| Index: cc/trees/tree_synchronizer.cc
|
| diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
|
| index 3f467e04ad6b50dc20074aa34aa3ce54ea23ed7f..b593a9d66e9e6982baaef07fab91cbf1a0976e82 100644
|
| --- a/cc/trees/tree_synchronizer.cc
|
| +++ b/cc/trees/tree_synchronizer.cc
|
| @@ -13,7 +13,6 @@
|
| #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"
|
|
|
| @@ -46,8 +45,8 @@ void TreeSynchronizer::SynchronizeTrees(Layer* layer_root,
|
| 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());
|
| }
|
| }
|
|
|
| @@ -105,7 +104,7 @@ void TreeSynchronizer::PushLayerProperties(LayerTreeImpl* pending_tree,
|
| active_tree);
|
| }
|
|
|
| -void TreeSynchronizer::PushLayerProperties(LayerTree* host_tree,
|
| +void TreeSynchronizer::PushLayerProperties(LayerTreeHost* host_tree,
|
| LayerTreeImpl* impl_tree) {
|
| PushLayerPropertiesInternal(host_tree->LayersThatShouldPushProperties(),
|
| impl_tree);
|
|
|