cc: Consolidate LayerList types.

cc/trees/tree_synchronizer.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/tree_synchronizer.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/scrollbar_layer.h"
 #include "cc/layers/scrollbar_layer_impl.h"
 
 namespace cc {
 
 typedef ScopedPtrHashMap<int, LayerImpl> ScopedPtrLayerImplMap;
 typedef base::hash_map<int, LayerImpl*> RawPtrLayerImplMap;
 
 void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers,
                                        scoped_ptr<LayerImpl> layer_impl) {
   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));
 
   CollectExistingLayerImplRecursive(old_layers, layer_impl->TakeMaskLayer());
   CollectExistingLayerImplRecursive(old_layers, layer_impl->TakeReplicaLayer());
 
   int id = layer_impl->id();
   old_layers->set(id, layer_impl.Pass());
 }
@@ skipping 154 matching lines @@
     DCHECK(!layer_impl);
     return;
   }
 
   DCHECK_EQ(layer->id(), layer_impl->id());
   layer->PushPropertiesTo(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) {
     PushPropertiesInternal(layer->child_at(i), impl_children[i]);
   }
 }
 
 void TreeSynchronizer::PushProperties(Layer* layer, LayerImpl* layer_impl) {
   PushPropertiesInternal(layer, layer_impl);
 }
 
 void TreeSynchronizer::PushProperties(LayerImpl* layer, LayerImpl* layer_impl) {
   PushPropertiesInternal(layer, layer_impl);
 }
 
 }  // namespace cc