cc: Replace ScopedPtrVector<RenderPass> with RenderPassList

R=enne@chromium.org
BUG=NONE
TEST=NONE(No functional change)

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

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

7 files changed, 17 insertions, 18 deletions

diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index 89af53a7..30a7b01 100644
--- a/cc/layers/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -113,7 +113,7 @@ void DelegatedRendererLayerImpl::SetFrameData(
 
   resource_provider->ReceiveFromChild(child_id_, frame_data->resource_list);
 
-  ScopedPtrVector<RenderPass> render_pass_list;
+  RenderPassList render_pass_list;
   RenderPass::CopyAll(frame_data->render_pass_list, &render_pass_list);
 
   bool invalid_frame = false;
@@ -157,11 +157,11 @@ void DelegatedRendererLayerImpl::SetFrameData(
 }
 
 void DelegatedRendererLayerImpl::SetRenderPasses(
-    ScopedPtrVector<RenderPass>* render_passes_in_draw_order) {
+    RenderPassList* render_passes_in_draw_order) {
   ClearRenderPasses();
 
   for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) {
-    ScopedPtrVector<RenderPass>::iterator to_take =
+    RenderPassList::iterator to_take =
         render_passes_in_draw_order->begin() + i;
     render_passes_index_by_id_.insert(
         std::pair<RenderPass::Id, int>((*to_take)->id, i));
diff --git a/cc/layers/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h
index 8a2bff1..57fa371 100644
--- a/cc/layers/delegated_renderer_layer_impl.h
+++ b/cc/layers/delegated_renderer_layer_impl.h
@@ -53,7 +53,7 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
   DelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, int id);
 
   int ChildIdForTesting() const { return child_id_; }
-  const ScopedPtrVector<RenderPass>& RenderPassesInDrawOrderForTesting() const {
+  const RenderPassList& RenderPassesInDrawOrderForTesting() const {
     return render_passes_in_draw_order_;
   }
   const ResourceProvider::ResourceIdArray& ResourcesForTesting() const {
@@ -66,8 +66,7 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
   void AppendRainbowDebugBorder(RenderPass* render_pass,
                                 AppendQuadsData* append_quads_data);
 
-  void SetRenderPasses(
-      ScopedPtrVector<RenderPass>* render_passes_in_draw_order);
+  void SetRenderPasses(RenderPassList* render_passes_in_draw_order);
   void ClearRenderPasses();
 
   // Returns |true| if the delegated_render_pass_id is part of the current
@@ -88,7 +87,7 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
 
   bool have_render_passes_to_push_;
   float inverse_device_scale_factor_;
-  ScopedPtrVector<RenderPass> render_passes_in_draw_order_;
+  RenderPassList render_passes_in_draw_order_;
   base::hash_map<RenderPass::Id, int> render_passes_index_by_id_;
   ResourceProvider::ResourceIdArray resources_;
 
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 93cc6f5..57523a9 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -90,7 +90,7 @@ class DelegatedRendererLayerImplTestSimple
     transform.Translate(1.0, 1.0);
     delegated_renderer_layer->SetTransform(transform);
 
-    ScopedPtrVector<RenderPass> delegated_render_passes;
+    RenderPassList delegated_render_passes;
     TestRenderPass* pass1 = AddRenderPass(&delegated_render_passes,
                                           RenderPass::Id(9, 6),
                                           gfx::Rect(6, 6, 6, 6),
@@ -505,7 +505,7 @@ class DelegatedRendererLayerImplTestTransform
     transform.Translate(8.0, 8.0);
     delegated_renderer_layer->SetTransform(transform);
 
-    ScopedPtrVector<RenderPass> delegated_render_passes;
+    RenderPassList delegated_render_passes;
 
     gfx::Size child_pass_content_bounds(7, 7);
     gfx::Rect child_pass_rect(20, 20, 7, 7);
@@ -952,7 +952,7 @@ class DelegatedRendererLayerImplTestClip
     delegated_renderer_layer->SetContentBounds(gfx::Size(50, 50));
     delegated_renderer_layer->SetDrawsContent(true);
 
-    ScopedPtrVector<RenderPass> delegated_render_passes;
+    RenderPassList delegated_render_passes;
 
     gfx::Size child_pass_content_bounds(7, 7);
     gfx::Rect child_pass_rect(20, 20, 7, 7);
@@ -1350,7 +1350,7 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) {
   delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
   delegated_renderer_layer->SetDrawsContent(true);
 
-  ScopedPtrVector<RenderPass> delegated_render_passes;
+  RenderPassList delegated_render_passes;
   TestRenderPass* pass1 = AddRenderPass(
       &delegated_render_passes,
       RenderPass::Id(9, 6),
@@ -1406,7 +1406,7 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) {
   delegated_renderer_layer_impl->SetContentBounds(layer_size);
   delegated_renderer_layer_impl->SetDrawsContent(true);
 
-  ScopedPtrVector<RenderPass> delegated_render_passes;
+  RenderPassList delegated_render_passes;
   // pass2 is just the size of the quad. It contributes to |pass1| with a
   // translation of (11,0).
   RenderPass::Id pass2_id =
diff --git a/cc/layers/render_surface_unittest.cc b/cc/layers/render_surface_unittest.cc
index fc259b8..0c1646f 100644
--- a/cc/layers/render_surface_unittest.cc
+++ b/cc/layers/render_surface_unittest.cc
@@ -138,12 +138,12 @@ class TestRenderPassSink : public RenderPassSink {
     render_passes_.push_back(render_pass.Pass());
   }
 
-  const ScopedPtrVector<RenderPass>& RenderPasses() const {
+  const RenderPassList& RenderPasses() const {
     return render_passes_;
   }
 
  private:
-  ScopedPtrVector<RenderPass> render_passes_;
+  RenderPassList render_passes_;
 };
 
 TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectRenderPass) {
diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h
index 644f180..d5f465f 100644
--- a/cc/output/delegated_frame_data.h
+++ b/cc/output/delegated_frame_data.h
@@ -22,7 +22,7 @@ class CC_EXPORT DelegatedFrameData {
   float device_scale_factor;
 
   TransferableResourceArray resource_list;
-  ScopedPtrVector<RenderPass> render_pass_list;
+  RenderPassList render_pass_list;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DelegatedFrameData);
diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc
index d59eac5..b7d3254 100644
--- a/cc/test/fake_delegated_renderer_layer_impl.cc
+++ b/cc/test/fake_delegated_renderer_layer_impl.cc
@@ -52,7 +52,7 @@ void NoopReturnCallback(const ReturnedResourceArray& returned) {}
 
 void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses(
     float device_scale_factor,
-    ScopedPtrVector<RenderPass>* pass_list) {
+    RenderPassList* pass_list) {
   scoped_ptr<DelegatedFrameData> delegated_frame(new DelegatedFrameData);
   delegated_frame->device_scale_factor = device_scale_factor;
   delegated_frame->render_pass_list.swap(*pass_list);
diff --git a/cc/test/fake_delegated_renderer_layer_impl.h b/cc/test/fake_delegated_renderer_layer_impl.h
index 0a071a5..157f5d6 100644
--- a/cc/test/fake_delegated_renderer_layer_impl.h
+++ b/cc/test/fake_delegated_renderer_layer_impl.h
@@ -21,13 +21,13 @@ class FakeDelegatedRendererLayerImpl : public DelegatedRendererLayerImpl {
       OVERRIDE;
 
   int ChildId() const { return ChildIdForTesting(); }
-  const ScopedPtrVector<RenderPass>& RenderPassesInDrawOrder() const {
+  const RenderPassList& RenderPassesInDrawOrder() const {
     return RenderPassesInDrawOrderForTesting();
   }
   ResourceProvider::ResourceIdSet Resources() const;
 
   void SetFrameDataForRenderPasses(float device_scale_factor,
-                                   ScopedPtrVector<RenderPass>* pass_list);
+                                   RenderPassList* pass_list);
 
  protected:
   FakeDelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, int id);