Use custom ListContainer to allocate DrawQuads

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 "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
+#include "cc/quads/list_container.h"
 #include "cc/quads/render_pass_id.h"
 #include "skia/ext/refptr.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace base {
 namespace debug {
 class TracedValue;
 }
 class Value;
 };
 
 namespace cc {
 
 class DrawQuad;
+class CopyOutputRequest;
 class RenderPassDrawQuad;
-class CopyOutputRequest;
 class SharedQuadState;
 
 // A list of DrawQuad objects, sorted internally in front-to-back order.
-class QuadList : public ScopedPtrVector<DrawQuad> {
+class QuadList : public ListContainer<DrawQuad> {
  public:
-  typedef reverse_iterator BackToFrontIterator;
-  typedef const_reverse_iterator ConstBackToFrontIterator;
+  explicit QuadList(size_t default_size_to_reserve);
+
+  typedef QuadList::ReverseIterator BackToFrontIterator;
+  typedef QuadList::ConstReverseIterator ConstBackToFrontIterator;
 
   inline BackToFrontIterator BackToFrontBegin() { return rbegin(); }
   inline BackToFrontIterator BackToFrontEnd() { return rend(); }
   inline ConstBackToFrontIterator BackToFrontBegin() const { return rbegin(); }
   inline ConstBackToFrontIterator BackToFrontEnd() const { return rend(); }
 };
 
 typedef ScopedPtrVector<SharedQuadState> SharedQuadStateList;
 
 class CC_EXPORT RenderPass {
@@ skipping 18 matching lines @@
 
   void SetAll(RenderPassId id,
               const gfx::Rect& output_rect,
               const gfx::Rect& damage_rect,
               const gfx::Transform& transform_to_root_target,
               bool has_transparent_background);
 
   void AsValueInto(base::debug::TracedValue* dict) const;
 
   SharedQuadState* CreateAndAppendSharedQuadState();
+
   template <typename DrawQuadType>
   DrawQuadType* CreateAndAppendDrawQuad() {
-    scoped_ptr<DrawQuadType> draw_quad = make_scoped_ptr(new DrawQuadType);
-    quad_list.push_back(draw_quad.template PassAs<DrawQuad>());
-    return static_cast<DrawQuadType*>(quad_list.back());
+    return quad_list.AllocateAndConstruct<DrawQuadType>();
   }
 
   RenderPassDrawQuad* CopyFromAndAppendRenderPassDrawQuad(
       const RenderPassDrawQuad* quad,
       const SharedQuadState* shared_quad_state,
       RenderPassId render_pass_id);
   DrawQuad* CopyFromAndAppendDrawQuad(const DrawQuad* quad,
                                       const SharedQuadState* shared_quad_state);
 
   // Uniquely identifies the render pass in the compositor's current frame.
@@ skipping 19 matching lines @@
   QuadList quad_list;
   SharedQuadStateList shared_quad_state_list;
 
  protected:
   explicit RenderPass(size_t num_layers);
   RenderPass();
 
  private:
   template <typename DrawQuadType>
   DrawQuadType* CopyFromAndAppendTypedDrawQuad(const DrawQuad* quad) {
-    scoped_ptr<DrawQuadType> draw_quad =
-        make_scoped_ptr(new DrawQuadType(*DrawQuadType::MaterialCast(quad)));
-    quad_list.push_back(draw_quad.template PassAs<DrawQuad>());
-    return static_cast<DrawQuadType*>(quad_list.back());
+    return quad_list.AllocateAndCopyFrom(DrawQuadType::MaterialCast(quad));
   }
 
   DISALLOW_COPY_AND_ASSIGN(RenderPass);
 };
 
 }  // namespace cc
 
 namespace BASE_HASH_NAMESPACE {
 #if defined(COMPILER_MSVC)
 inline size_t hash_value(const cc::RenderPassId& key) {
@@ skipping 10 matching lines @@
 #error define a hash function for your compiler
 #endif  // COMPILER
 }  // namespace BASE_HASH_NAMESPACE
 
 namespace cc {
 typedef ScopedPtrVector<RenderPass> RenderPassList;
 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap;
 }  // namespace cc
 
 #endif  // CC_QUADS_RENDER_PASS_H_