Index: cc/quads/draw_quad_unittest.cc |
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc |
index 2b491f4400ee0504e3ed9eea2e60d6278de200cd..cb116092d4a6e486bb4acaecc7cb419c018faa59 100644 |
--- a/cc/quads/draw_quad_unittest.cc |
+++ b/cc/quads/draw_quad_unittest.cc |
@@ -594,16 +594,18 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { |
ResourceProvider::ResourceId u_plane_resource_id = 532; |
ResourceProvider::ResourceId v_plane_resource_id = 4; |
ResourceProvider::ResourceId a_plane_resource_id = 63; |
+ YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::REC_601_JPEG; |
CREATE_SHARED_STATE(); |
- CREATE_QUAD_7_NEW(YUVVideoDrawQuad, |
+ CREATE_QUAD_8_NEW(YUVVideoDrawQuad, |
opaque_rect, |
visible_rect, |
tex_coord_rect, |
y_plane_resource_id, |
u_plane_resource_id, |
v_plane_resource_id, |
- a_plane_resource_id); |
+ a_plane_resource_id, |
+ color_space); |
EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material); |
EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect); |
EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect); |
@@ -612,19 +614,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(color_space, copy_quad->color_space); |
- CREATE_QUAD_5_ALL(YUVVideoDrawQuad, |
+ CREATE_QUAD_6_ALL(YUVVideoDrawQuad, |
tex_coord_rect, |
y_plane_resource_id, |
u_plane_resource_id, |
v_plane_resource_id, |
- a_plane_resource_id); |
+ a_plane_resource_id, |
+ color_space); |
EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material); |
EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect); |
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(color_space, copy_quad->color_space); |
} |
TEST(DrawQuadTest, CopyPictureDrawQuad) { |
@@ -853,21 +858,24 @@ 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; |
+ YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::REC_601_JPEG; |
CREATE_SHARED_STATE(); |
- CREATE_QUAD_7_NEW(YUVVideoDrawQuad, |
+ CREATE_QUAD_8_NEW(YUVVideoDrawQuad, |
opaque_rect, |
visible_rect, |
tex_coord_rect, |
y_plane_resource_id, |
u_plane_resource_id, |
v_plane_resource_id, |
- a_plane_resource_id); |
+ a_plane_resource_id, |
+ color_space); |
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(color_space, quad_new->color_space); |
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); |