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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 380893004: Move Copy method from DrawQuad to RenderPass (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moreRP4DQ
Patch Set: add RP to DQ_unittests to test Copy Created 6 years, 5 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/draw_quad.cc ('k') | cc/quads/render_pass.cc » ('j') | cc/quads/render_pass.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index f0f77190ffbe7c2d5f07d4b93aaf53f2baf4aa7f..7a828a5b57a5bbcd4e31e1d1577863b1af236020 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -14,6 +14,7 @@
#include "cc/quads/debug_border_draw_quad.h"
#include "cc/quads/io_surface_draw_quad.h"
#include "cc/quads/picture_draw_quad.h"
+#include "cc/quads/render_pass.h"
#include "cc/quads/render_pass_draw_quad.h"
#include "cc/quads/solid_color_draw_quad.h"
#include "cc/quads/stream_video_draw_quad.h"
@@ -60,7 +61,7 @@ TEST(DrawQuadTest, CopySharedQuadState) {
EXPECT_EQ(blend_mode, copy->blend_mode);
}
-scoped_ptr<SharedQuadState> CreateSharedQuadState() {
+SharedQuadState* CreateSharedQuadState(RenderPass* render_pass) {
gfx::Transform quad_transform = gfx::Transform(1.0, 0.0, 0.5, 1.0, 0.5, 0.0);
gfx::Size content_bounds(26, 28);
gfx::Rect visible_content_rect(10, 12, 14, 16);
@@ -70,7 +71,7 @@ scoped_ptr<SharedQuadState> CreateSharedQuadState() {
int sorting_context_id = 65536;
SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode;
- scoped_ptr<SharedQuadState> state(new SharedQuadState);
+ SharedQuadState* state = render_pass->CreateAndAppendSharedQuadState();
state->SetAll(quad_transform,
content_bounds,
visible_content_rect,
@@ -79,7 +80,7 @@ scoped_ptr<SharedQuadState> CreateSharedQuadState() {
opacity,
blend_mode,
sorting_context_id);
- return state.Pass();
+ return state;
}
void CompareDrawQuad(DrawQuad* quad,
@@ -93,10 +94,11 @@ void CompareDrawQuad(DrawQuad* quad,
EXPECT_EQ(copy_shared_state, copy->shared_quad_state);
}
-#define CREATE_SHARED_STATE() \
- scoped_ptr<SharedQuadState> shared_state(CreateSharedQuadState()); \
- scoped_ptr<SharedQuadState> copy_shared_state(new SharedQuadState); \
- copy_shared_state->CopyFrom(shared_state.get());
+#define CREATE_SHARED_STATE() \
+ SharedQuadState* shared_state(CreateSharedQuadState(render_pass.get())); \
+ SharedQuadState* copy_shared_state = \
+ render_pass->CreateAndAppendSharedQuadState(); \
+ copy_shared_state->CopyFrom(shared_state);
#define QUAD_DATA \
gfx::Rect quad_rect(30, 40, 50, 60); \
@@ -104,237 +106,301 @@ void CompareDrawQuad(DrawQuad* quad,
gfx::Rect ALLOW_UNUSED quad_opaque_rect(60, 55, 10, 10); \
bool ALLOW_UNUSED needs_blending = true;
-#define SETUP_AND_COPY_QUAD_NEW(Type, quad) \
- scoped_ptr<DrawQuad> copy_new(quad_new->Copy(copy_shared_state.get())); \
- CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \
- const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new.get());
-
-#define SETUP_AND_COPY_QUAD_ALL(Type, quad) \
- scoped_ptr<DrawQuad> copy_all(quad_all->Copy(copy_shared_state.get())); \
- CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
- copy_quad = Type::MaterialCast(copy_all.get());
-
-#define SETUP_AND_COPY_QUAD_NEW_1(Type, quad, a) \
- scoped_ptr<DrawQuad> copy_new(quad_new->Copy(copy_shared_state.get(), a)); \
- CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \
- const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new.get());
-
-#define SETUP_AND_COPY_QUAD_ALL_1(Type, quad, a) \
- scoped_ptr<DrawQuad> copy_all(quad_all->Copy(copy_shared_state.get(), a)); \
- CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
- copy_quad = Type::MaterialCast(copy_all.get());
-
-#define CREATE_QUAD_1_NEW(Type, a) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_1_ALL(Type, a) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_2_NEW(Type, a, b) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_2_ALL(Type, a, b) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a, b); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_3_NEW(Type, a, b, c) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_3_ALL(Type, a, b, c) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a, b, c); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_4_NEW(Type, a, b, c, d) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_4_ALL(Type, a, b, c, d) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a, b, c, d); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_5_NEW(Type, a, b, c, d, e) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_5_ALL(Type, a, b, c, d, e) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a, b, c, d, e); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_5_NEW_1(Type, a, b, c, d, e, copy_a) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e); \
- } \
- SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
-
-#define CREATE_QUAD_5_ALL_1(Type, a, b, c, d, e, copy_a) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a, b, c, d, e); \
- } \
- SETUP_AND_COPY_QUAD_ALL_1(Type, quad_all, copy_a);
-
-#define CREATE_QUAD_6_NEW(Type, a, b, c, d, e, f) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e, f); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_6_ALL(Type, a, b, c, d, e, f) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, a, b, c, d, e, f); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_7_NEW(Type, a, b, c, d, e, f, g) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e, f, g); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_7_ALL(Type, a, b, c, d, e, f, g) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, \
- a, b, c, d, e, f, g); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
-
-#define CREATE_QUAD_7_NEW_1(Type, a, b, c, d, e, f, g, copy_a) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e, f, g); \
- } \
- SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
-
-#define CREATE_QUAD_7_ALL_1(Type, a, b, c, d, e, f, g, copy_a) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, \
- a, b, c, d, e, f, g); \
- } \
- SETUP_AND_COPY_QUAD_ALL_1(Type, quad_all, copy_a);
-
-#define CREATE_QUAD_8_NEW(Type, a, b, c, d, e, f, g, h) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e, f, g, h); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
-
-#define CREATE_QUAD_8_ALL(Type, a, b, c, d, e, f, g, h) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, \
- a, b, c, d, e, f, g, h); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+#define SETUP_AND_COPY_QUAD_NEW(Type, quad) \
+ DrawQuad* copy_new = \
+ render_pass->CopyFromAndAppendDrawQuad(quad_new, copy_shared_state); \
+ CompareDrawQuad(quad_new, copy_new, copy_shared_state); \
+ const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new);
+
+#define SETUP_AND_COPY_QUAD_ALL(Type, quad) \
+ DrawQuad* copy_all = \
+ render_pass->CopyFromAndAppendDrawQuad(quad_all, copy_shared_state); \
+ CompareDrawQuad(quad_all, copy_all, copy_shared_state); \
+ copy_quad = Type::MaterialCast(copy_all);
+
+#define SETUP_AND_COPY_QUAD_NEW_1(Type, quad, a) \
danakj 2014/07/10 19:53:25 let's rename this to say RENDER_PASS or RP or some
weiliangc 2014/07/11 15:59:12 Done.
+ DrawQuad* copy_new = render_pass->CopyFromAndAppendRenderPassDrawQuad( \
+ quad_new, copy_shared_state, a); \
+ CompareDrawQuad(quad_new, copy_new, copy_shared_state); \
+ const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new);
+
+#define SETUP_AND_COPY_QUAD_ALL_1(Type, quad, a) \
+ DrawQuad* copy_all = render_pass->CopyFromAndAppendRenderPassDrawQuad( \
+ quad_all, copy_shared_state, a); \
+ CompareDrawQuad(quad_all, copy_all, copy_shared_state); \
+ copy_quad = Type::MaterialCast(copy_all);
+
+#define CREATE_QUAD_1_NEW(Type, a) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a); } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_1_ALL(Type, a) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_2_NEW(Type, a, b) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b); } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_2_ALL(Type, a, b) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_3_NEW(Type, a, b, c) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c); } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_3_ALL(Type, a, b, c) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_4_NEW(Type, a, b, c, d) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d); } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_4_ALL(Type, a, b, c, d) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_5_NEW(Type, a, b, c, d, e) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e); } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_5_ALL(Type, a, b, c, d, e) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_5_NEW_1(Type, a, b, c, d, e, copy_a) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e); } \
+ SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
+
+#define CREATE_QUAD_5_ALL_1(Type, a, b, c, d, e, copy_a) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL_1(Type, quad_all, copy_a);
+
+#define CREATE_QUAD_6_NEW(Type, a, b, c, d, e, f) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e, f); } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_6_ALL(Type, a, b, c, d, e, f) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e, \
+ f); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_7_NEW(Type, a, b, c, d, e, f, g) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e, f, g); \
+ } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_7_ALL(Type, a, b, c, d, e, f, g) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e, \
+ f, \
+ g); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+
+#define CREATE_QUAD_7_NEW_1(Type, a, b, c, d, e, f, g, copy_a) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e, f, g); \
+ } \
+ SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
+
+#define CREATE_QUAD_7_ALL_1(Type, a, b, c, d, e, f, g, copy_a) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e, \
+ f, \
+ g); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL_1(Type, quad_all, copy_a);
+
+#define CREATE_QUAD_8_NEW(Type, a, b, c, d, e, f, g, h) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_new->SetNew( \
+ shared_state, quad_rect, a, b, c, d, e, f, g, h); \
+ } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+
+#define CREATE_QUAD_8_ALL(Type, a, b, c, d, e, f, g, h) \
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e, \
+ f, \
+ g, \
+ h); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
#define CREATE_QUAD_8_NEW_1(Type, a, b, c, d, e, f, g, h, copy_a) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e, f, g, h); \
- } \
- SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_new->SetNew( \
+ shared_state, quad_rect, a, b, c, d, e, f, g, h); \
+ } \
+ SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
#define CREATE_QUAD_8_ALL_1(Type, a, b, c, d, e, f, g, h, copy_a) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, \
- a, b, c, d, e, f, g, h); \
- } \
- SETUP_AND_COPY_QUAD_ALL_1(Type, quad_all, copy_a);
+ Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e, \
+ f, \
+ g, \
+ h); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL_1(Type, quad_all, copy_a);
-#define CREATE_QUAD_9_NEW(Type, a, b, c, d, e, f, g, h, i) \
- scoped_ptr<Type> quad_new(Type::Create()); \
- { \
- QUAD_DATA \
- quad_new->SetNew(shared_state.get(), quad_rect, \
- a, b, c, d, e, f, g, h, i); \
- } \
- SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
+#define CREATE_QUAD_9_NEW(Type, a, b, c, d, e, f, g, h, i) \
+ Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+ { \
+ QUAD_DATA quad_new->SetNew( \
+ shared_state, quad_rect, a, b, c, d, e, f, g, h, i); \
+ } \
+ SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
#define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \
- scoped_ptr<Type> quad_all(Type::Create()); \
- { \
- QUAD_DATA \
- quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
- quad_visible_rect, needs_blending, \
- a, b, c, d, e, f, g, h, i); \
- } \
- SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
+ { \
+ QUAD_DATA quad_all->SetAll(shared_state, \
+ quad_rect, \
+ quad_opaque_rect, \
+ quad_visible_rect, \
+ needs_blending, \
+ a, \
+ b, \
+ c, \
+ d, \
+ e, \
+ f, \
+ g, \
+ h, \
+ i); \
+ } \
+ SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
TEST(DrawQuadTest, CopyCheckerboardDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SkColor color = 0xfabb0011;
CREATE_SHARED_STATE();
@@ -350,6 +416,7 @@ TEST(DrawQuadTest, CopyCheckerboardDrawQuad) {
}
TEST(DrawQuadTest, CopyDebugBorderDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SkColor color = 0xfabb0011;
int width = 99;
@@ -368,6 +435,7 @@ TEST(DrawQuadTest, CopyDebugBorderDrawQuad) {
}
TEST(DrawQuadTest, CopyIOSurfaceDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
danakj 2014/07/10 19:53:25 can we move this into the CREATE_SHARED_STATE() ma
weiliangc 2014/07/11 15:59:12 Done.
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
gfx::Size size(58, 95);
@@ -396,6 +464,7 @@ TEST(DrawQuadTest, CopyIOSurfaceDrawQuad) {
}
TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
RenderPass::Id render_pass_id(22, 64);
bool is_replica = true;
@@ -453,6 +522,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
}
TEST(DrawQuadTest, CopySolidColorDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SkColor color = 0x49494949;
bool force_anti_aliasing_off = false;
@@ -472,6 +542,7 @@ TEST(DrawQuadTest, CopySolidColorDrawQuad) {
}
TEST(DrawQuadTest, CopyStreamVideoDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
ResourceProvider::ResourceId resource_id = 64;
@@ -493,6 +564,7 @@ TEST(DrawQuadTest, CopyStreamVideoDrawQuad) {
}
TEST(DrawQuadTest, CopySurfaceDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SurfaceId surface_id(1234);
CREATE_SHARED_STATE();
@@ -509,6 +581,7 @@ TEST(DrawQuadTest, CopySurfaceDrawQuad) {
TEST(DrawQuadTest, CopyTextureDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
unsigned resource_id = 82;
@@ -557,6 +630,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
}
TEST(DrawQuadTest, CopyTileDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 44, 22, 33);
gfx::Rect visible_rect(40, 50, 30, 20);
unsigned resource_id = 104;
@@ -593,6 +667,7 @@ TEST(DrawQuadTest, CopyTileDrawQuad) {
}
TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
gfx::RectF tex_coord_rect(0.0f, 0.0f, 0.75f, 0.5f);
@@ -639,6 +714,7 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
}
TEST(DrawQuadTest, CopyPictureDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 44, 22, 33);
gfx::Rect visible_rect(40, 50, 30, 20);
gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f);
@@ -704,25 +780,28 @@ class DrawQuadIteratorTest : public testing::Test {
};
TEST_F(DrawQuadIteratorTest, CheckerboardDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SkColor color = 0xfabb0011;
CREATE_SHARED_STATE();
CREATE_QUAD_2_NEW(CheckerboardDrawQuad, visible_rect, color);
- EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(0, IterateAndCount(quad_new));
}
TEST_F(DrawQuadIteratorTest, DebugBorderDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SkColor color = 0xfabb0011;
int width = 99;
CREATE_SHARED_STATE();
CREATE_QUAD_3_NEW(DebugBorderDrawQuad, visible_rect, color, width);
- EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(0, IterateAndCount(quad_new));
}
TEST_F(DrawQuadIteratorTest, IOSurfaceDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
gfx::Size size(58, 95);
@@ -737,11 +816,12 @@ TEST_F(DrawQuadIteratorTest, IOSurfaceDrawQuad) {
resource_id,
orientation);
EXPECT_EQ(resource_id, quad_new->io_surface_resource_id);
- EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(1, IterateAndCount(quad_new));
EXPECT_EQ(resource_id + 1, quad_new->io_surface_resource_id);
}
TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
RenderPass::Id render_pass_id(22, 64);
bool is_replica = true;
@@ -768,14 +848,15 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
background_filters,
copied_render_pass_id);
EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id);
- EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(1, IterateAndCount(quad_new));
EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id);
quad_new->mask_resource_id = 0;
- EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(0, IterateAndCount(quad_new));
EXPECT_EQ(0u, quad_new->mask_resource_id);
}
TEST_F(DrawQuadIteratorTest, SolidColorDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SkColor color = 0x49494949;
bool force_anti_aliasing_off = false;
@@ -783,10 +864,11 @@ TEST_F(DrawQuadIteratorTest, SolidColorDrawQuad) {
CREATE_SHARED_STATE();
CREATE_QUAD_3_NEW(
SolidColorDrawQuad, visible_rect, color, force_anti_aliasing_off);
- EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(0, IterateAndCount(quad_new));
}
TEST_F(DrawQuadIteratorTest, StreamVideoDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
ResourceProvider::ResourceId resource_id = 64;
@@ -796,20 +878,22 @@ TEST_F(DrawQuadIteratorTest, StreamVideoDrawQuad) {
CREATE_QUAD_4_NEW(
StreamVideoDrawQuad, opaque_rect, visible_rect, resource_id, matrix);
EXPECT_EQ(resource_id, quad_new->resource_id);
- EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(1, IterateAndCount(quad_new));
EXPECT_EQ(resource_id + 1, quad_new->resource_id);
}
TEST_F(DrawQuadIteratorTest, SurfaceDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect visible_rect(40, 50, 30, 20);
SurfaceId surface_id(4321);
CREATE_SHARED_STATE();
CREATE_QUAD_2_NEW(SurfaceDrawQuad, visible_rect, surface_id);
- EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(0, IterateAndCount(quad_new));
}
TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
unsigned resource_id = 82;
@@ -831,11 +915,12 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
vertex_opacity,
flipped);
EXPECT_EQ(resource_id, quad_new->resource_id);
- EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(1, IterateAndCount(quad_new));
EXPECT_EQ(resource_id + 1, quad_new->resource_id);
}
TEST_F(DrawQuadIteratorTest, TileDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 44, 22, 33);
gfx::Rect visible_rect(40, 50, 30, 20);
unsigned resource_id = 104;
@@ -852,11 +937,12 @@ TEST_F(DrawQuadIteratorTest, TileDrawQuad) {
texture_size,
swizzle_contents);
EXPECT_EQ(resource_id, quad_new->resource_id);
- EXPECT_EQ(1, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(1, IterateAndCount(quad_new));
EXPECT_EQ(resource_id + 1, quad_new->resource_id);
}
TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 47, 10, 12);
gfx::Rect visible_rect(40, 50, 30, 20);
gfx::RectF tex_coord_rect(0.0f, 0.0f, 0.75f, 0.5f);
@@ -882,7 +968,7 @@ TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
EXPECT_EQ(v_plane_resource_id, quad_new->v_plane_resource_id);
EXPECT_EQ(a_plane_resource_id, quad_new->a_plane_resource_id);
EXPECT_EQ(color_space, quad_new->color_space);
- EXPECT_EQ(4, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(4, IterateAndCount(quad_new));
EXPECT_EQ(y_plane_resource_id + 1, quad_new->y_plane_resource_id);
EXPECT_EQ(u_plane_resource_id + 1, quad_new->u_plane_resource_id);
EXPECT_EQ(v_plane_resource_id + 1, quad_new->v_plane_resource_id);
@@ -891,6 +977,7 @@ TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
// Disabled until picture draw quad is supported for ubercomp: crbug.com/231715
TEST_F(DrawQuadIteratorTest, DISABLED_PictureDrawQuad) {
+ scoped_ptr<RenderPass> render_pass = RenderPass::Create();
gfx::Rect opaque_rect(33, 44, 22, 33);
gfx::Rect visible_rect(40, 50, 30, 20);
gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f);
@@ -910,7 +997,7 @@ TEST_F(DrawQuadIteratorTest, DISABLED_PictureDrawQuad) {
content_rect,
contents_scale,
picture_pile);
- EXPECT_EQ(0, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(0, IterateAndCount(quad_new));
}
} // namespace
« no previous file with comments | « cc/quads/draw_quad.cc ('k') | cc/quads/render_pass.cc » ('j') | cc/quads/render_pass.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698