| 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..cfacfd631c893831c81924a93d61651c77d1a0a1 100644
|
| --- a/cc/quads/draw_quad_unittest.cc
|
| +++ b/cc/quads/draw_quad_unittest.cc
|
| @@ -334,6 +334,14 @@ void CompareDrawQuad(DrawQuad* quad,
|
| } \
|
| SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
|
|
|
| +#define CREATE_QUAD_9_NEW_1(Type, a, b, c, d, e, f, g, h, i, 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, i); \
|
| + } \
|
| + SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
|
| +
|
| TEST(DrawQuadTest, CopyCheckerboardDrawQuad) {
|
| gfx::Rect visible_rect(40, 50, 30, 20);
|
| SkColor color = 0xfabb0011;
|
| @@ -407,11 +415,12 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| FilterOperations background_filters;
|
| background_filters.Append(
|
| FilterOperation::CreateGrayscaleFilter(1.f));
|
| + gfx::Vector2dF scale(1.f, 1.f);
|
|
|
| RenderPass::Id copied_render_pass_id(235, 11);
|
| CREATE_SHARED_STATE();
|
|
|
| - CREATE_QUAD_8_NEW_1(RenderPassDrawQuad,
|
| + CREATE_QUAD_9_NEW_1(RenderPassDrawQuad,
|
| visible_rect,
|
| render_pass_id,
|
| is_replica,
|
| @@ -420,6 +429,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| mask_u_v_rect,
|
| filters,
|
| background_filters,
|
| + scale,
|
| copied_render_pass_id);
|
| EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
|
| EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect);
|
| @@ -432,7 +442,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| EXPECT_EQ(filters, copy_quad->filters);
|
| EXPECT_EQ(background_filters, copy_quad->background_filters);
|
|
|
| - CREATE_QUAD_7_ALL_1(RenderPassDrawQuad,
|
| + CREATE_QUAD_8_ALL_1(RenderPassDrawQuad,
|
| render_pass_id,
|
| is_replica,
|
| mask_resource_id,
|
| @@ -440,6 +450,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| mask_u_v_rect,
|
| filters,
|
| background_filters,
|
| + scale,
|
| copied_render_pass_id);
|
| EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
|
| EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
|
| @@ -753,11 +764,12 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
|
| FilterOperations background_filters;
|
| background_filters.Append(
|
| FilterOperation::CreateGrayscaleFilter(1.f));
|
| + gfx::Vector2dF scale(1.f, 1.f);
|
|
|
| RenderPass::Id copied_render_pass_id(235, 11);
|
|
|
| CREATE_SHARED_STATE();
|
| - CREATE_QUAD_8_NEW_1(RenderPassDrawQuad,
|
| + CREATE_QUAD_9_NEW_1(RenderPassDrawQuad,
|
| visible_rect,
|
| render_pass_id,
|
| is_replica,
|
| @@ -766,6 +778,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
|
| mask_u_v_rect,
|
| filters,
|
| background_filters,
|
| + scale,
|
| copied_render_pass_id);
|
| EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id);
|
| EXPECT_EQ(1, IterateAndCount(quad_new.get()));
|
|
|