Use custom ListContainer to allocate DrawQuads

cc/quads/render_pass.h

Index: cc/quads/render_pass.h
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 5b0c3b61be16f371cba040c5821e109bc58459b7..fe1e4d386f47926af03e530f062881aa86b4625a 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -12,7 +12,10 @@
 #include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/quads/render_pass_id.h"
+#include "cc/quads/largest_draw_quad.h"
+#include "cc/quads/list_container.h"
+#include "cc/quads/render_pass_draw_quad.h"
+#include "cc/quads/stream_video_draw_quad.h"
 #include "skia/ext/refptr.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
@@ -28,15 +31,18 @@ class Value;
 namespace cc {
 
 class DrawQuad;
-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)
+      : ListContainer<DrawQuad>(sizeof(kLargestDrawQuad),
+                                default_size_to_reserve) {}
+
+  typedef QuadList::ReverseIterator BackToFrontIterator;
+  typedef QuadList::ConstReverseIterator ConstBackToFrontIterator;
 
   inline BackToFrontIterator BackToFrontBegin() { return rbegin(); }
   inline BackToFrontIterator BackToFrontEnd() { return rend(); }
@@ -75,11 +81,10 @@ class CC_EXPORT RenderPass {
   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(
@@ -119,10 +124,7 @@ class CC_EXPORT 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.AllocateAndCopyConstruct(DrawQuadType::MaterialCast(quad));
   }
 
   DISALLOW_COPY_AND_ASSIGN(RenderPass);