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 1a99184185865ebdbd44baf451ee8a80dfa5196a..a47ed475ce8fac41b2eb5c96ccac4344d738fa37 100644 |
| --- a/cc/quads/draw_quad_unittest.cc |
| +++ b/cc/quads/draw_quad_unittest.cc |
| @@ -551,15 +551,17 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { |
| ResourceProvider::ResourceId u_plane_resource_id = 532; |
| ResourceProvider::ResourceId v_plane_resource_id = 4; |
| ResourceProvider::ResourceId a_plane_resource_id = 63; |
| + bool has_jpeg_color_range = false; |
|
danakj
2013/12/03 21:35:34
use a non-0 value for this in case copying just se
|
| CREATE_SHARED_STATE(); |
| - CREATE_QUAD_6_NEW(YUVVideoDrawQuad, |
| + CREATE_QUAD_7_NEW(YUVVideoDrawQuad, |
| opaque_rect, |
| tex_scale, |
| y_plane_resource_id, |
| u_plane_resource_id, |
| v_plane_resource_id, |
| - a_plane_resource_id); |
| + a_plane_resource_id, |
| + has_jpeg_color_range); |
| EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material); |
| EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect); |
| EXPECT_EQ(tex_scale, copy_quad->tex_scale); |
| @@ -567,19 +569,22 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { |
| EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id); |
| EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id); |
| EXPECT_EQ(a_plane_resource_id, copy_quad->a_plane_resource_id); |
| + EXPECT_EQ(has_jpeg_color_range, copy_quad->has_jpeg_color_range); |
| - CREATE_QUAD_5_ALL(YUVVideoDrawQuad, |
| + CREATE_QUAD_6_ALL(YUVVideoDrawQuad, |
| tex_scale, |
| y_plane_resource_id, |
| u_plane_resource_id, |
| v_plane_resource_id, |
| - a_plane_resource_id); |
| + a_plane_resource_id, |
| + has_jpeg_color_range); |
| EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material); |
| EXPECT_EQ(tex_scale, copy_quad->tex_scale); |
| EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id); |
| EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id); |
| EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id); |
| EXPECT_EQ(a_plane_resource_id, copy_quad->a_plane_resource_id); |
| + EXPECT_EQ(has_jpeg_color_range, copy_quad->has_jpeg_color_range); |
| } |
| TEST(DrawQuadTest, CopyPictureDrawQuad) { |
| @@ -785,20 +790,23 @@ TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) { |
| ResourceProvider::ResourceId u_plane_resource_id = 532; |
| ResourceProvider::ResourceId v_plane_resource_id = 4; |
| ResourceProvider::ResourceId a_plane_resource_id = 63; |
| + bool has_jpeg_color_range = false; |
|
danakj
2013/12/03 21:35:34
same here
|
| CREATE_SHARED_STATE(); |
| - CREATE_QUAD_6_NEW(YUVVideoDrawQuad, |
| + CREATE_QUAD_7_NEW(YUVVideoDrawQuad, |
| opaque_rect, |
| tex_scale, |
| y_plane_resource_id, |
| u_plane_resource_id, |
| v_plane_resource_id, |
| - a_plane_resource_id); |
| + a_plane_resource_id, |
| + has_jpeg_color_range); |
| EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material); |
| EXPECT_EQ(y_plane_resource_id, quad_new->y_plane_resource_id); |
| EXPECT_EQ(u_plane_resource_id, quad_new->u_plane_resource_id); |
| 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(has_jpeg_color_range, quad_new->has_jpeg_color_range); |
| EXPECT_EQ(4, IterateAndCount(quad_new.get())); |
| 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); |