Chromium Code Reviews| Index: cc/trees/tree_synchronizer.cc |
| diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc |
| index 9c61acb65aa0d9d59a49375fa6d43e88d3244752..30183cf3d02557d582284a921107c029377e9a5e 100644 |
| --- a/cc/trees/tree_synchronizer.cc |
| +++ b/cc/trees/tree_synchronizer.cc |
| @@ -25,10 +25,10 @@ void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers, |
| return; |
| OwnedLayerImplList& children = layer_impl->children(); |
| - for (OwnedLayerImplList::iterator it = children.begin(); |
| - it != children.end(); |
| - ++it) |
| - CollectExistingLayerImplRecursive(old_layers, children.take(it)); |
| + for (OwnedLayerImplList::iterator it = children.begin(); it != children.end(); |
|
danakj
2015/11/17 01:12:19
range-based and auto?
vmpstr
2015/11/17 23:26:25
Done.
|
| + ++it) { |
| + CollectExistingLayerImplRecursive(old_layers, it->Pass()); |
| + } |
| CollectExistingLayerImplRecursive(old_layers, layer_impl->TakeMaskLayer()); |
| CollectExistingLayerImplRecursive(old_layers, layer_impl->TakeReplicaLayer()); |
| @@ -163,8 +163,7 @@ void TreeSynchronizer::PushPropertiesInternal( |
| DCHECK_EQ(layer->children().size(), impl_children.size()); |
| for (size_t i = 0; i < layer->children().size(); ++i) { |
| - PushPropertiesInternal(layer->child_at(i), |
| - impl_children[i], |
| + PushPropertiesInternal(layer->child_at(i), impl_children[i].get(), |
| &num_dependents_need_push_properties); |
| } |