cc: Consolidate LayerList types.

cc/trees/layer_tree_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/trees/layer_tree_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/input/pinch_zoom_scrollbar.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/layer.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
 
 namespace cc {
 
 LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl)
     : layer_tree_host_impl_(layer_tree_host_impl),
@@ skipping 302 matching lines @@
 void LayerTreeImpl::ClearRenderSurfaces() {
   ClearRenderSurfacesOnLayerImplRecursive(root_layer());
   render_surface_layer_list_.clear();
   set_needs_update_draw_properties();
 }
 
 bool LayerTreeImpl::AreVisibleResourcesReady() const {
   TRACE_EVENT0("cc", "LayerTreeImpl::AreVisibleResourcesReady");
 
   typedef LayerIterator<LayerImpl,
-                        std::vector<LayerImpl*>,
+                        LayerImplList,
                         RenderSurfaceImpl,
                         LayerIteratorActions::BackToFront> LayerIteratorType;
   LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_);
   for (LayerIteratorType it = LayerIteratorType::Begin(
            &render_surface_layer_list_); it != end; ++it) {
     if (it.represents_itself() && !(*it)->AreVisibleResourcesReady())
       return false;
   }
 
   return true;
 }
 
-const LayerTreeImpl::LayerList& LayerTreeImpl::RenderSurfaceLayerList() const {
+const LayerImplList& LayerTreeImpl::RenderSurfaceLayerList() const {
   // If this assert triggers, then the list is dirty.
   DCHECK(!needs_update_draw_properties_);
   return render_surface_layer_list_;
 }
 
 gfx::Size LayerTreeImpl::ScrollableSize() const {
   if (!root_scroll_layer_ || root_scroll_layer_->children().empty())
     return gfx::Size();
   return root_scroll_layer_->children()[0]->bounds();
 }
@@ skipping 170 matching lines @@
   return layer_tree_host_impl_->debug_rect_history();
 }
 
 AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
   return layer_tree_host_impl_->animation_registrar();
 }
 
 scoped_ptr<base::Value> LayerTreeImpl::AsValue() const {
   scoped_ptr<base::ListValue> state(new base::ListValue());
   typedef LayerIterator<LayerImpl,
-                        std::vector<LayerImpl*>,
+                        LayerImplList,
                         RenderSurfaceImpl,
                         LayerIteratorActions::BackToFront> LayerIteratorType;
   LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_);
   for (LayerIteratorType it = LayerIteratorType::Begin(
            &render_surface_layer_list_); it != end; ++it) {
     if (!it.represents_itself())
       continue;
     state->Append((*it)->AsValue().release());
   }
   return state.PassAs<base::Value>();
@@ skipping 107 matching lines @@
   StartFadeOutAnimation(PinchZoomScrollbarHorizontal());
   StartFadeOutAnimation(PinchZoomScrollbarVertical());
 }
 
 bool LayerTreeImpl::HasPinchZoomScrollbars() const {
   return pinch_zoom_scrollbar_horizontal_layer_id_ != Layer::INVALID_ID &&
          pinch_zoom_scrollbar_vertical_layer_id_ != Layer::INVALID_ID;
 }
 
 }  // namespace cc