Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(878)

Unified Diff: cc/test/fake_layer_tree_host.cc

Issue 1808373002: cc : Make tree synchronization independent of layer tree hierarchy (2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/proto/layer_tree_host.proto ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cef4b32ea1c114d30299c1e2339ba4a21c526c53..b0af310ea252ed5e2770894d5ba97150c6c8a41e 100644
--- a/cc/test/fake_layer_tree_host.cc
+++ b/cc/test/fake_layer_tree_host.cc
@@ -86,7 +86,8 @@ 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());
+ TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(),
+ active_tree());
active_tree()->SetRootLayer(std::move(layer_impl));
active_tree()->UpdatePropertyTreeScrollOffset(property_trees());
@@ -110,7 +111,8 @@ 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());
+ TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(),
+ pending_tree());
pending_tree()->SetRootLayer(std::move(layer_impl));
pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());
« no previous file with comments | « cc/proto/layer_tree_host.proto ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698