| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_TREES_TREE_SYNCHRONIZER_H_ | 5 #ifndef CC_TREES_TREE_SYNCHRONIZER_H_ |
| 6 #define CC_TREES_TREE_SYNCHRONIZER_H_ | 6 #define CC_TREES_TREE_SYNCHRONIZER_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 // tree provided by old_layer_impl_root if possible. | 22 // tree provided by old_layer_impl_root if possible. |
| 23 static scoped_ptr<LayerImpl> SynchronizeTrees( | 23 static scoped_ptr<LayerImpl> SynchronizeTrees( |
| 24 Layer* layer_root, | 24 Layer* layer_root, |
| 25 scoped_ptr<LayerImpl> old_layer_impl_root, | 25 scoped_ptr<LayerImpl> old_layer_impl_root, |
| 26 LayerTreeImpl* tree_impl); | 26 LayerTreeImpl* tree_impl); |
| 27 static scoped_ptr<LayerImpl> SynchronizeTrees( | 27 static scoped_ptr<LayerImpl> SynchronizeTrees( |
| 28 LayerImpl* layer_root, | 28 LayerImpl* layer_root, |
| 29 scoped_ptr<LayerImpl> old_layer_impl_root, | 29 scoped_ptr<LayerImpl> old_layer_impl_root, |
| 30 LayerTreeImpl* tree_impl); | 30 LayerTreeImpl* tree_impl); |
| 31 | 31 |
| 32 // Pushes properties from a Layer or LayerImpl tree to a structurally | |
| 33 // equivalent LayerImpl tree. | |
| 34 static void PushProperties(Layer* layer_root, | |
| 35 LayerImpl* layer_impl_root); | |
| 36 static void PushProperties(LayerImpl* layer_root, LayerImpl* layer_impl_root); | |
| 37 | |
| 38 private: | 32 private: |
| 39 TreeSynchronizer(); // Not instantiable. | 33 TreeSynchronizer(); // Not instantiable. |
| 40 | 34 |
| 41 static void PushPropertiesInternal( | |
| 42 Layer* layer, | |
| 43 LayerImpl* layer_impl, | |
| 44 int* num_dependents_need_push_properties_for_parent); | |
| 45 | |
| 46 DISALLOW_COPY_AND_ASSIGN(TreeSynchronizer); | 35 DISALLOW_COPY_AND_ASSIGN(TreeSynchronizer); |
| 47 }; | 36 }; |
| 48 | 37 |
| 49 } // namespace cc | 38 } // namespace cc |
| 50 | 39 |
| 51 #endif // CC_TREES_TREE_SYNCHRONIZER_H_ | 40 #endif // CC_TREES_TREE_SYNCHRONIZER_H_ |
| OLD | NEW |