From a370ef52788ea0f6c410b05ec40a74ee9bf3a647 Mon Sep 17 00:00:00 2001
From: vmpstr <vmpstr@chromium.org>
Date: Wed, 18 Nov 2015 02:41:28 -0800
Subject: cc: Remove ScopedPtrVector and cc::remove_if.

This patch removes ScopedPtrVector and cc::remove_if. It depends on
https://codereview.chromium.org/1441613002 for TakeBack.

R=danakj
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

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

Cr-Commit-Position: refs/heads/master@{#360318}
---
 cc/quads/render_pass.cc          |  8 +++-----
 cc/quads/render_pass.h           | 10 +++++-----
 cc/quads/render_pass_unittest.cc |  7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'cc/quads')

diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc
index dc79bb8..3737f3c 100644
--- a/cc/quads/render_pass.cc
+++ b/cc/quads/render_pass.cc
@@ -92,11 +92,9 @@ scoped_ptr<RenderPass> RenderPass::Copy(RenderPassId new_id) const {
 }
 
 // static
-void RenderPass::CopyAll(const ScopedPtrVector<RenderPass>& in,
-                         ScopedPtrVector<RenderPass>* out) {
-  for (size_t i = 0; i < in.size(); ++i) {
-    RenderPass* source = in[i];
-
+void RenderPass::CopyAll(const std::vector<scoped_ptr<RenderPass>>& in,
+                         std::vector<scoped_ptr<RenderPass>>* out) {
+  for (const auto& source : in) {
     // Since we can't copy these, it's wrong to use CopyAll in a situation where
     // you may have copy_requests present.
     DCHECK_EQ(source->copy_requests.size(), 0u);
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 14caeba..bc64d74 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -6,13 +6,13 @@
 #define CC_QUADS_RENDER_PASS_H_
 
 #include <utility>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/list_container.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/quads/render_pass_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "skia/ext/refptr.h"
@@ -64,8 +64,8 @@ class CC_EXPORT RenderPass {
   scoped_ptr<RenderPass> Copy(RenderPassId new_id) const;
 
   // A deep copy of the render passes in the list including the quads.
-  static void CopyAll(const ScopedPtrVector<RenderPass>& in,
-                      ScopedPtrVector<RenderPass>* out);
+  static void CopyAll(const std::vector<scoped_ptr<RenderPass>>& in,
+                      std::vector<scoped_ptr<RenderPass>>* out);
 
   void SetNew(RenderPassId id,
               const gfx::Rect& output_rect,
@@ -112,7 +112,7 @@ class CC_EXPORT RenderPass {
   // contents as a bitmap, and give a copy of the bitmap to each callback in
   // this list. This property should not be serialized between compositors, as
   // it only makes sense in the root compositor.
-  ScopedPtrVector<CopyOutputRequest> copy_requests;
+  std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
 
   QuadList quad_list;
   SharedQuadStateList shared_quad_state_list;
@@ -147,7 +147,7 @@ struct hash<cc::RenderPassId> {
 }  // namespace BASE_HASH_NAMESPACE
 
 namespace cc {
-typedef ScopedPtrVector<RenderPass> RenderPassList;
+typedef std::vector<scoped_ptr<RenderPass>> RenderPassList;
 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap;
 }  // namespace cc
 
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index dea89cc..d4c0bc7 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -5,7 +5,6 @@
 #include "cc/quads/render_pass.h"
 
 #include "cc/base/math_util.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ -28,15 +27,15 @@ struct RenderPassSize {
   gfx::Rect damage_rect;
   bool has_transparent_background;
   std::vector<SurfaceId> referenced_surfaces;
-  ScopedPtrVector<CopyOutputRequest> copy_callbacks;
+  std::vector<scoped_ptr<CopyOutputRequest>> copy_callbacks;
 };
 
 static void CompareRenderPassLists(const RenderPassList& expected_list,
                                    const RenderPassList& actual_list) {
   EXPECT_EQ(expected_list.size(), actual_list.size());
   for (size_t i = 0; i < actual_list.size(); ++i) {
-    RenderPass* expected = expected_list[i];
-    RenderPass* actual = actual_list[i];
+    RenderPass* expected = expected_list[i].get();
+    RenderPass* actual = actual_list[i].get();
 
     EXPECT_EQ(expected->id, actual->id);
     EXPECT_EQ(expected->output_rect, actual->output_rect);
-- 
cgit v1.1