Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: cc/quads/render_pass.h

Issue 448303002: Use custom ListContainer to allocate DrawQuads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@perftest
Patch Set: change header files to try fix compile error Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/quads/list_container_unittest.cc ('k') | cc/quads/render_pass.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/render_pass.h
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 5b0c3b61be16f371cba040c5821e109bc58459b7..db42faf1e3ffa5cf2aeddc509116bc1f8a196314 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -12,6 +12,7 @@
#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"
@@ -28,15 +29,17 @@ class Value;
namespace cc {
class DrawQuad;
-class RenderPassDrawQuad;
class CopyOutputRequest;
+class RenderPassDrawQuad;
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(); }
@@ -75,11 +78,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 +121,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.AllocateAndCopyFrom(DrawQuadType::MaterialCast(quad));
}
DISALLOW_COPY_AND_ASSIGN(RenderPass);
« no previous file with comments | « cc/quads/list_container_unittest.cc ('k') | cc/quads/render_pass.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698