cc : Make tree synchronization independent of layer tree hierarchy (2)

cc/test/fake_layer_tree_host.cc

 // Copyright 2013 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/test/fake_layer_tree_host.h"
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/test_task_graph_runner.h"
 
@@ skipping 70 matching lines @@
 }
 
 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; }
 
 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
   scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree();
 
   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());
 
   if (page_scale_layer() && inner_viewport_scroll_layer()) {
     active_tree()->SetViewportLayersFromIds(
         overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id()
                                       : Layer::INVALID_ID,
         page_scale_layer()->id(), inner_viewport_scroll_layer()->id(),
         outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id()
                                       : Layer::INVALID_ID);
   }
 
   active_tree()->UpdatePropertyTreesForBoundsDelta();
   return active_tree()->root_layer();
 }
 
 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() {
   scoped_ptr<LayerImpl> old_root_layer_impl = pending_tree()->DetachLayerTree();
 
   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 TreeSynchronizer so that it doesn't have
to be duplicated here and in LayerTreeHost (and so that this test code tests the
real push properties logic)? This also looks the same as the logic for pushing
properties between LayerTreeImpls, so perhaps (with templating) we can avoid
duplication there too.

[jaydasika, 2016/03/19 02:17:58]

Done.

+  }
 
   pending_tree()->SetRootLayer(std::move(layer_impl));
   pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());
   return pending_tree()->root_layer();
 }
 
 }  // namespace cc