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

Unified Diff: cc/trees/tree_synchronizer.cc

Issue 13285002: cc: Consolidate LayerList types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/quad_culler_unittest.cc ('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 130d404bf1c85f58481b2b5f4282e854a4cd7aaf..8b4d4d64ec595a0ba29ee26476ef3356c0af0c62 100644
--- a/cc/trees/tree_synchronizer.cc
+++ b/cc/trees/tree_synchronizer.cc
@@ -22,8 +22,8 @@ void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers,
if (!layer_impl)
return;
- ScopedPtrVector<LayerImpl>& children = layer_impl->children();
- for (ScopedPtrVector<LayerImpl>::iterator it = children.begin();
+ OwnedLayerImplList& children = layer_impl->children();
+ for (OwnedLayerImplList::iterator it = children.begin();
it != children.end();
++it)
CollectExistingLayerImplRecursive(old_layers, children.take(it));
@@ -198,7 +198,7 @@ void PushPropertiesInternal(LayerType* layer, LayerImpl* layer_impl) {
PushPropertiesInternal(layer->mask_layer(), layer_impl->mask_layer());
PushPropertiesInternal(layer->replica_layer(), layer_impl->replica_layer());
- const ScopedPtrVector<LayerImpl>& impl_children = layer_impl->children();
+ const OwnedLayerImplList& impl_children = layer_impl->children();
DCHECK_EQ(layer->children().size(), impl_children.size());
for (size_t i = 0; i < layer->children().size(); ++i) {
« no previous file with comments | « cc/trees/quad_culler_unittest.cc ('k') | cc/trees/tree_synchronizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698