| Index: cc/trees/tree_synchronizer.h
|
| diff --git a/cc/trees/tree_synchronizer.h b/cc/trees/tree_synchronizer.h
|
| index 2e6e8f09092aa8bd0f0006e208eda8f9ffea61c2..3c873741ad0539b6116140861baee8dc319895c1 100644
|
| --- a/cc/trees/tree_synchronizer.h
|
| +++ b/cc/trees/tree_synchronizer.h
|
| @@ -12,6 +12,7 @@
|
| namespace cc {
|
|
|
| class LayerImpl;
|
| +class LayerTreeHost;
|
| class LayerTreeImpl;
|
| class Layer;
|
|
|
| @@ -28,21 +29,14 @@ class CC_EXPORT TreeSynchronizer {
|
| LayerImpl* layer_root,
|
| scoped_ptr<LayerImpl> old_layer_impl_root,
|
| LayerTreeImpl* tree_impl);
|
| -
|
| - // Pushes properties from a Layer or LayerImpl tree to a structurally
|
| - // equivalent LayerImpl tree.
|
| - static void PushProperties(Layer* layer_root,
|
| - LayerImpl* layer_impl_root);
|
| - static void PushProperties(LayerImpl* layer_root, LayerImpl* layer_impl_root);
|
| + static void PushLayerProperties(LayerTreeImpl* pending_tree,
|
| + LayerTreeImpl* active_tree);
|
| + static void PushLayerProperties(LayerTreeHost* host_tree,
|
| + LayerTreeImpl* impl_tree);
|
|
|
| private:
|
| TreeSynchronizer(); // Not instantiable.
|
|
|
| - static void PushPropertiesInternal(
|
| - Layer* layer,
|
| - LayerImpl* layer_impl,
|
| - int* num_dependents_need_push_properties_for_parent);
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(TreeSynchronizer);
|
| };
|
|
|
|
|