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

Unified Diff: cc/trees/tree_synchronizer.cc

Issue 2661523003: cc: Merge LayerTree into the LayerTreeHost. (Closed)
Patch Set: auto Created 3 years, 11 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/trees/tree_synchronizer.h ('k') | cc/trees/tree_synchronizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/tree_synchronizer.cc
diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
index 3f467e04ad6b50dc20074aa34aa3ce54ea23ed7f..b593a9d66e9e6982baaef07fab91cbf1a0976e82 100644
--- a/cc/trees/tree_synchronizer.cc
+++ b/cc/trees/tree_synchronizer.cc
@@ -13,7 +13,6 @@
#include "cc/layers/layer.h"
#include "cc/layers/layer_collections.h"
#include "cc/layers/layer_impl.h"
-#include "cc/trees/layer_tree.h"
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/layer_tree_impl.h"
@@ -46,8 +45,8 @@ void TreeSynchronizer::SynchronizeTrees(Layer* layer_root,
if (!layer_root) {
tree_impl->DetachLayers();
} else {
- SynchronizeTreesInternal(layer_root->GetLayerTree(), tree_impl,
- layer_root->GetLayerTree()->property_trees());
+ SynchronizeTreesInternal(layer_root->layer_tree_host(), tree_impl,
+ layer_root->layer_tree_host()->property_trees());
}
}
@@ -105,7 +104,7 @@ void TreeSynchronizer::PushLayerProperties(LayerTreeImpl* pending_tree,
active_tree);
}
-void TreeSynchronizer::PushLayerProperties(LayerTree* host_tree,
+void TreeSynchronizer::PushLayerProperties(LayerTreeHost* host_tree,
LayerTreeImpl* impl_tree) {
PushLayerPropertiesInternal(host_tree->LayersThatShouldPushProperties(),
impl_tree);
« no previous file with comments | « cc/trees/tree_synchronizer.h ('k') | cc/trees/tree_synchronizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698