Chromium Code Reviews| Index: cc/test/fake_layer_tree_host.cc |
| diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc |
| index 5125a7b9903628f9579bdd737bcaa81de68c999b..c1a2a10380812cc710684dc6dc5c7d47090fbee2 100644 |
| --- a/cc/test/fake_layer_tree_host.cc |
| +++ b/cc/test/fake_layer_tree_host.cc |
| @@ -88,7 +88,12 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { |
| scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( |
| root_layer(), std::move(old_root_layer_impl), active_tree()); |
| active_tree()->SetPropertyTrees(*property_trees()); |
| - TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); |
| + std::unordered_set<Layer*> layers_that_should_push_properties = |
| + root_layer()->layer_tree_host()->LayersThatShouldPushProperties(); |
| + for (auto layer : layers_that_should_push_properties) { |
| + LayerImpl* impl_layer = active_tree()->LayerById(layer->id()); |
| + layer->PushPropertiesTo(impl_layer); |
| + } |
| active_tree()->SetRootLayer(std::move(layer_impl)); |
| active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |
| @@ -112,7 +117,12 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { |
| scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( |
| root_layer(), std::move(old_root_layer_impl), pending_tree()); |
| pending_tree()->SetPropertyTrees(*property_trees()); |
| - TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); |
| + std::unordered_set<Layer*> layers_that_should_push_properties = |
| + root_layer()->layer_tree_host()->LayersThatShouldPushProperties(); |
| + for (auto layer : layers_that_should_push_properties) { |
| + LayerImpl* impl_layer = pending_tree()->LayerById(layer->id()); |
| + layer->PushPropertiesTo(impl_layer); |
|
ajuma
2016/03/18 14:33:15
How about putting this in a method in TreeSynchron
jaydasika
2016/03/19 02:17:58
Done.
|
| + } |
| pending_tree()->SetRootLayer(std::move(layer_impl)); |
| pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |