Index: cc/quads/draw_quad_unittest.cc |
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc |
index 8e600ff2165b7a934948ad6ab21e47932aeb7e9a..9bbb052ada9ebc5b4c0f159831faaa7af150fd4b 100644 |
--- a/cc/quads/draw_quad_unittest.cc |
+++ b/cc/quads/draw_quad_unittest.cc |
@@ -393,30 +393,21 @@ void CompareDrawQuad(DrawQuad* quad, |
} \ |
SETUP_AND_COPY_QUAD_NEW(Type, quad_new); |
-#define CREATE_QUAD_ALL_RP(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); \ |
- } \ |
+#define CREATE_QUAD_ALL_RP(Type, a, b, c, d, e, f, g, h, 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_RP(Type, quad_all, copy_a); |
-#define CREATE_QUAD_NEW_RP(Type, a, b, c, d, e, f, g, h, 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); \ |
- } \ |
+#define CREATE_QUAD_NEW_RP(Type, a, b, c, d, e, f, g, h, i, 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, i); \ |
+ } \ |
SETUP_AND_COPY_QUAD_NEW_RP(Type, quad_new, copy_a); |
TEST(DrawQuadTest, CopyDebugBorderDrawQuad) { |
@@ -446,6 +437,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) { |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(1.f)); |
gfx::Vector2dF filters_scale; |
+ gfx::PointF filters_origin; |
FilterOperations background_filters; |
background_filters.Append( |
FilterOperation::CreateGrayscaleFilter(1.f)); |
@@ -453,15 +445,9 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) { |
RenderPassId copied_render_pass_id(235, 11); |
CREATE_SHARED_STATE(); |
- CREATE_QUAD_NEW_RP(RenderPassDrawQuad, |
- visible_rect, |
- render_pass_id, |
- mask_resource_id, |
- mask_uv_scale, |
- mask_texture_size, |
- filters, |
- filters_scale, |
- background_filters, |
+ CREATE_QUAD_NEW_RP(RenderPassDrawQuad, visible_rect, render_pass_id, |
+ mask_resource_id, mask_uv_scale, mask_texture_size, |
+ filters, filters_scale, filters_origin, background_filters, |
copied_render_pass_id); |
EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); |
EXPECT_EQ(visible_rect, copy_quad->visible_rect); |
@@ -472,17 +458,12 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) { |
copy_quad->mask_texture_size.ToString()); |
EXPECT_EQ(filters, copy_quad->filters); |
EXPECT_EQ(filters_scale, copy_quad->filters_scale); |
+ EXPECT_EQ(filters_origin, copy_quad->filters_origin); |
EXPECT_EQ(background_filters, copy_quad->background_filters); |
- CREATE_QUAD_ALL_RP(RenderPassDrawQuad, |
- render_pass_id, |
- mask_resource_id, |
- mask_uv_scale, |
- mask_texture_size, |
- filters, |
- filters_scale, |
- background_filters, |
- copied_render_pass_id); |
+ CREATE_QUAD_ALL_RP(RenderPassDrawQuad, render_pass_id, mask_resource_id, |
+ mask_uv_scale, mask_texture_size, filters, filters_scale, |
+ filters_origin, background_filters, copied_render_pass_id); |
EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); |
EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); |
EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id()); |
@@ -491,6 +472,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) { |
copy_quad->mask_texture_size.ToString()); |
EXPECT_EQ(filters, copy_quad->filters); |
EXPECT_EQ(filters_scale, copy_quad->filters_scale); |
+ EXPECT_EQ(filters_origin, copy_quad->filters_origin); |
EXPECT_EQ(background_filters, copy_quad->background_filters); |
} |
@@ -775,6 +757,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) { |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBlurFilter(1.f)); |
gfx::Vector2dF filters_scale(2.f, 3.f); |
+ gfx::PointF filters_origin(0.f, 0.f); |
FilterOperations background_filters; |
background_filters.Append( |
FilterOperation::CreateGrayscaleFilter(1.f)); |
@@ -782,15 +765,9 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) { |
RenderPassId copied_render_pass_id(235, 11); |
CREATE_SHARED_STATE(); |
- CREATE_QUAD_NEW_RP(RenderPassDrawQuad, |
- visible_rect, |
- render_pass_id, |
- mask_resource_id, |
- mask_uv_scale, |
- mask_texture_size, |
- filters, |
- filters_scale, |
- background_filters, |
+ CREATE_QUAD_NEW_RP(RenderPassDrawQuad, visible_rect, render_pass_id, |
+ mask_resource_id, mask_uv_scale, mask_texture_size, |
+ filters, filters_scale, filters_origin, background_filters, |
copied_render_pass_id); |
EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id()); |
EXPECT_EQ(1, IterateAndCount(quad_new)); |
@@ -800,7 +777,7 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) { |
gfx::Rect quad_rect(30, 40, 50, 60); |
quad_new->SetNew(shared_state, quad_rect, visible_rect, render_pass_id, |
new_mask_resource_id, mask_uv_scale, mask_texture_size, |
- filters, filters_scale, background_filters); |
+ filters, filters_scale, filters_origin, background_filters); |
EXPECT_EQ(0, IterateAndCount(quad_new)); |
EXPECT_EQ(0u, quad_new->mask_resource_id()); |
} |