cc: Consolidate LayerList types.

cc/layers/layer_impl.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/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "cc/animation/animation_registrar.h"
@@ skipping 64 matching lines @@
 }
 
 void LayerImpl::AddChild(scoped_ptr<LayerImpl> child) {
   child->set_parent(this);
   DCHECK_EQ(layer_tree_impl(), child->layer_tree_impl());
   children_.push_back(child.Pass());
   layer_tree_impl()->set_needs_update_draw_properties();
 }
 
 scoped_ptr<LayerImpl> LayerImpl::RemoveChild(LayerImpl* child) {
-  for (ScopedPtrVector<LayerImpl>::iterator it = children_.begin();
+  for (OwnedLayerImplList::iterator it = children_.begin();
        it != children_.end();
        ++it) {
     if (*it == child) {
       scoped_ptr<LayerImpl> ret = children_.take(it);
       children_.erase(it);
       layer_tree_impl()->set_needs_update_draw_properties();
       return ret.Pass();
     }
   }
   return scoped_ptr<LayerImpl>();
 }
 
 void LayerImpl::ClearChildList() {
   if (children_.empty())
     return;
 
   children_.clear();
   layer_tree_impl()->set_needs_update_draw_properties();
 }
 
 void LayerImpl::CreateRenderSurface() {
   DCHECK(!draw_properties_.render_surface);
   draw_properties_.render_surface =
       make_scoped_ptr(new RenderSurfaceImpl(this));
   draw_properties_.render_target = this;
 }
 
+void LayerImpl::ClearRenderSurface() {
+  draw_properties_.render_surface.reset();
+}
+
 scoped_ptr<SharedQuadState> LayerImpl::CreateSharedQuadState() const {
   scoped_ptr<SharedQuadState> state = SharedQuadState::Create();
   state->SetAll(draw_properties_.target_space_transform,
                 draw_properties_.content_bounds,
                 draw_properties_.visible_content_rect,
                 draw_properties_.clip_rect,
                 draw_properties_.is_clipped,
                 draw_properties_.opacity);
   return state.Pass();
 }
@@ skipping 839 matching lines @@
   dict->Set("layer_quad", MathUtil::AsValue(layer_quad).release());
 }
 
 scoped_ptr<base::Value> LayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   AsValueInto(state.get());
   return state.PassAs<base::Value>();
 }
 
 }  // namespace cc