Chromium Code Reviews| Index: cc/quads/draw_quad_unittest.cc |
| diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc |
| index 7f5590543374ed9dd5dc72c16535e515b887fc68..a2accaf0917ed83aa53dd29c3efe0eff25e59875 100644 |
| --- a/cc/quads/draw_quad_unittest.cc |
| +++ b/cc/quads/draw_quad_unittest.cc |
| @@ -125,6 +125,15 @@ void CompareDrawQuad(DrawQuad* quad, |
| CompareDrawQuad(quad_all, copy_all, copy_shared_state); \ |
| copy_quad = Type::MaterialCast(copy_all); |
| +#define CREATE_QUAD_ALL(Type, ...) \ |
|
danakj
2017/06/07 15:26:40
Oh cute, can you remove all the CREATE_QUAD_X_ALL
|
| + Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \ |
| + { \ |
| + QUAD_DATA quad_all->SetAll(shared_state, quad_rect, quad_opaque_rect, \ |
| + quad_visible_rect, needs_blending, \ |
| + __VA_ARGS__); \ |
| + } \ |
| + SETUP_AND_COPY_QUAD_ALL(Type, quad_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); } \ |
| @@ -636,6 +645,7 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { |
| float resource_offset = 0.5f; |
| float resource_multiplier = 2.001f; |
| uint32_t bits_per_channel = 5; |
| + bool require_overlay = true; |
| YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::JPEG; |
| gfx::ColorSpace video_color_space = gfx::ColorSpace::CreateJpeg(); |
| CREATE_SHARED_STATE(); |
| @@ -661,12 +671,13 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { |
| EXPECT_EQ(resource_offset, copy_quad->resource_offset); |
| EXPECT_EQ(resource_multiplier, copy_quad->resource_multiplier); |
| EXPECT_EQ(bits_per_channel, copy_quad->bits_per_channel); |
| + EXPECT_FALSE(copy_quad->require_overlay); |
| - CREATE_QUAD_13_ALL(YUVVideoDrawQuad, ya_tex_coord_rect, uv_tex_coord_rect, |
| - ya_tex_size, uv_tex_size, y_plane_resource_id, |
| - u_plane_resource_id, v_plane_resource_id, |
| - a_plane_resource_id, color_space, video_color_space, |
| - resource_offset, resource_multiplier, bits_per_channel); |
| + CREATE_QUAD_ALL(YUVVideoDrawQuad, ya_tex_coord_rect, uv_tex_coord_rect, |
| + ya_tex_size, uv_tex_size, y_plane_resource_id, |
| + u_plane_resource_id, v_plane_resource_id, a_plane_resource_id, |
| + color_space, video_color_space, resource_offset, |
| + resource_multiplier, bits_per_channel, require_overlay); |
| EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material); |
| EXPECT_EQ(ya_tex_coord_rect, copy_quad->ya_tex_coord_rect); |
| EXPECT_EQ(uv_tex_coord_rect, copy_quad->uv_tex_coord_rect); |
| @@ -680,6 +691,7 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { |
| EXPECT_EQ(resource_offset, copy_quad->resource_offset); |
| EXPECT_EQ(resource_multiplier, copy_quad->resource_multiplier); |
| EXPECT_EQ(bits_per_channel, copy_quad->bits_per_channel); |
| + EXPECT_EQ(require_overlay, copy_quad->require_overlay); |
| } |
| TEST(DrawQuadTest, CopyPictureDrawQuad) { |