| Index: cc/quads/draw_quad_unittest.cc
|
| diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
|
| index 1918a5154f0996dc0cb458a4cc75e8876ac6dcfe..6ad178deaf7e90d59921eafaa69638051e20403e 100644
|
| --- a/cc/quads/draw_quad_unittest.cc
|
| +++ b/cc/quads/draw_quad_unittest.cc
|
| @@ -318,6 +318,15 @@ void CompareDrawQuad(DrawQuad* quad,
|
| } \
|
| SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
|
|
|
| +#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);
|
| +
|
| #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \
|
| scoped_ptr<Type> quad_all(Type::Create()); \
|
| { \
|
| @@ -398,6 +407,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
|
| FilterOperations filters;
|
| filters.Append(FilterOperation::CreateBlurFilter(1.f));
|
| + gfx::Vector2dF filters_scale;
|
| FilterOperations background_filters;
|
| background_filters.Append(
|
| FilterOperation::CreateGrayscaleFilter(1.f));
|
| @@ -405,7 +415,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| 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,
|
| @@ -413,6 +423,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
|
| contents_changed_since_last_frame,
|
| mask_u_v_rect,
|
| filters,
|
| + filters_scale,
|
| background_filters,
|
| copied_render_pass_id);
|
| EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
|
| @@ -426,13 +437,14 @@ 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,
|
| contents_changed_since_last_frame,
|
| mask_u_v_rect,
|
| filters,
|
| + filters_scale,
|
| background_filters,
|
| copied_render_pass_id);
|
| EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
|
| @@ -746,7 +758,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
|
| 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,
|
| @@ -754,6 +766,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
|
| contents_changed_since_last_frame,
|
| mask_u_v_rect,
|
| filters,
|
| + gfx::Vector2dF(),
|
| background_filters,
|
| copied_render_pass_id);
|
| EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id);
|
|
|