cc: Consolidate LayerList types.

We currently have Layer::LayerList, LayerImpl::LayerList,
LayerTreeHost::LayerList and LayerTreeHostImpl::LayerList,
as well as LayerTreeImpl::LayerList, LayerSorter::LayerList,
and I think some more.

This patch consolidates the list typedefs into three types:
LayerList, LayerImplList, and OwnedLayerImplList.

LayerList and LayerImplList are the output of
CalculateDrawProperties. While OwnedLayerImplList is a list
that owns the layer pointers in it, ie ScopedPtrVector.

R=jamesr

Review URL: https://codereview.chromium.org/13285002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191442 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 9 deletions

diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index 6433d8b..7eaf6ab 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -6,6 +6,7 @@
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 
@@ -22,7 +23,7 @@ DebugRectHistory::~DebugRectHistory() {}
 
 void DebugRectHistory::SaveDebugRectsForCurrentFrame(
     LayerImpl* root_layer,
-    const std::vector<LayerImpl*>& render_surface_layer_list,
+    const LayerImplList& render_surface_layer_list,
     const std::vector<gfx::Rect>& occluding_screen_space_rects,
     const std::vector<gfx::Rect>& non_occluding_screen_space_rects,
     const LayerTreeDebugState& debug_state) {
@@ -73,7 +74,7 @@ void DebugRectHistory::SavePaintRects(LayerImpl* layer) {
 }
 
 void DebugRectHistory::SavePropertyChangedRects(
-    const std::vector<LayerImpl*>& render_surface_layer_list) {
+    const LayerImplList& render_surface_layer_list) {
   for (int surface_index = render_surface_layer_list.size() - 1;
        surface_index >= 0;
        --surface_index) {
@@ -81,7 +82,7 @@ void DebugRectHistory::SavePropertyChangedRects(
     RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
     DCHECK(render_surface);
 
-    const std::vector<LayerImpl*>& layer_list = render_surface->layer_list();
+    const LayerImplList& layer_list = render_surface->layer_list();
     for (unsigned layer_index = 0;
          layer_index < layer_list.size();
          ++layer_index) {
@@ -107,7 +108,7 @@ void DebugRectHistory::SavePropertyChangedRects(
 }
 
 void DebugRectHistory::SaveSurfaceDamageRects(
-    const std::vector<LayerImpl*>& render_surface_layer_list) {
+    const LayerImplList& render_surface_layer_list) {
   for (int surface_index = render_surface_layer_list.size() - 1;
        surface_index >= 0;
        --surface_index) {
@@ -124,7 +125,7 @@ void DebugRectHistory::SaveSurfaceDamageRects(
 }
 
 void DebugRectHistory::SaveScreenSpaceRects(
-    const std::vector<LayerImpl*>& render_surface_layer_list) {
+    const LayerImplList& render_surface_layer_list) {
   for (int surface_index = render_surface_layer_list.size() - 1;
        surface_index >= 0;
        --surface_index) {
diff --git a/cc/debug/debug_rect_history.h b/cc/debug/debug_rect_history.h
index be98e9d..c95b62e 100644
--- a/cc/debug/debug_rect_history.h
+++ b/cc/debug/debug_rect_history.h
@@ -8,6 +8,7 @@
 #include <vector>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/layers/layer_lists.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 
@@ -72,7 +73,7 @@ class DebugRectHistory {
   // reset.
   void SaveDebugRectsForCurrentFrame(
       LayerImpl* root_layer,
-      const std::vector<LayerImpl*>& render_surface_layer_list,
+      const LayerImplList& render_surface_layer_list,
       const std::vector<gfx::Rect>& occluding_screen_space_rects,
       const std::vector<gfx::Rect>& non_occluding_screen_space_rects,
       const LayerTreeDebugState& debug_state);
@@ -84,11 +85,11 @@ class DebugRectHistory {
 
   void SavePaintRects(LayerImpl* layer);
   void SavePropertyChangedRects(
-      const std::vector<LayerImpl*>& render_surface_layer_list);
+      const LayerImplList& render_surface_layer_list);
   void SaveSurfaceDamageRects(
-      const std::vector<LayerImpl*>& render_surface_layer_list);
+      const LayerImplList& render_surface_layer_list);
   void SaveScreenSpaceRects(
-      const std::vector<LayerImpl*>& render_surface_layer_list);
+      const LayerImplList& render_surface_layer_list);
   void SaveOccludingRects(
       const std::vector<gfx::Rect>& occluding_screen_space_rects);
   void SaveNonOccludingRects(