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

Unified Diff: cc/trees/tree_synchronizer.h

Issue 1801853002: Transfer LayerImpl ownership to LayerTreeImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more asan. 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/trees/layer_tree_impl_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/tree_synchronizer.h
diff --git a/cc/trees/tree_synchronizer.h b/cc/trees/tree_synchronizer.h
index 3c873741ad0539b6116140861baee8dc319895c1..260bd7b455d81f7a3f719f66ab7f3446c76f8f6f 100644
--- a/cc/trees/tree_synchronizer.h
+++ b/cc/trees/tree_synchronizer.h
@@ -21,14 +21,9 @@ class CC_EXPORT TreeSynchronizer {
// Accepts a Layer tree and returns a reference to a LayerImpl tree that
// duplicates the structure of the Layer tree, reusing the LayerImpls in the
// tree provided by old_layer_impl_root if possible.
- static scoped_ptr<LayerImpl> SynchronizeTrees(
- Layer* layer_root,
- scoped_ptr<LayerImpl> old_layer_impl_root,
- LayerTreeImpl* tree_impl);
- static scoped_ptr<LayerImpl> SynchronizeTrees(
- LayerImpl* layer_root,
- scoped_ptr<LayerImpl> old_layer_impl_root,
- LayerTreeImpl* tree_impl);
+ static void SynchronizeTrees(Layer* layer_root, LayerTreeImpl* tree_impl);
+ static void SynchronizeTrees(LayerImpl* layer_root, LayerTreeImpl* tree_impl);
+
static void PushLayerProperties(LayerTreeImpl* pending_tree,
LayerTreeImpl* active_tree);
static void PushLayerProperties(LayerTreeHost* host_tree,
« no previous file with comments | « cc/trees/layer_tree_impl_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698