cc: Remove ScopedPtrVector and cc::remove_if.

cc/quads/render_pass.h

 // 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.
 
 #ifndef CC_QUADS_RENDER_PASS_H_
 #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"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
@@ skipping 31 matching lines @@
   static scoped_ptr<RenderPass> Create();
   static scoped_ptr<RenderPass> Create(size_t num_layers);
   static scoped_ptr<RenderPass> Create(size_t shared_quad_state_list_size,
                                        size_t quad_list_size);
 
   // A shallow copy of the render pass, which does not include its quads or copy
   // requests.
   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,
               const gfx::Rect& damage_rect,
               const gfx::Transform& transform_to_root_target);
 
   void SetAll(RenderPassId id,
               const gfx::Rect& output_rect,
               const gfx::Rect& damage_rect,
               const gfx::Transform& transform_to_root_target,
@@ skipping 26 matching lines @@
   // render pass' |output_rect|.
   gfx::Transform transform_to_root_target;
 
   // If false, the pixels in the render pass' texture are all opaque.
   bool has_transparent_background;
 
   // If non-empty, the renderer should produce a copy of the render pass'
   // 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;
 
   // This vector contains the complete set of SurfaceIds referenced by
   // DrawQuads in quad_list.
   std::vector<SurfaceId> referenced_surfaces;
 
  protected:
   explicit RenderPass(size_t num_layers);
@@ skipping 14 matching lines @@
 namespace BASE_HASH_NAMESPACE {
 template <>
 struct hash<cc::RenderPassId> {
   size_t operator()(cc::RenderPassId key) const {
     return base::HashPair(key.layer_id, static_cast<int>(key.index));
   }
 };
 }  // namespace BASE_HASH_NAMESPACE
 
 namespace cc {
-typedef ScopedPtrVector<RenderPass> RenderPassList;
+typedef std::vector<scoped_ptr<RenderPass>> RenderPassList;

[danakj, 2015/11/17 01:12:17]

fun fact, this also is defined in renderer.h. wow.

[vmpstr, 2015/11/17 23:26:24]

Twice for good measure?

 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap;
 }  // namespace cc
 
 #endif  // CC_QUADS_RENDER_PASS_H_