| Index: cc/quads/draw_quad_unittest.cc
|
| diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
|
| index 61844b585064251fe71c5610bb2f13ec83a287fe..7782c35fa7c5e113924016e2eb62096dbd1304d2 100644
|
| --- a/cc/quads/draw_quad_unittest.cc
|
| +++ b/cc/quads/draw_quad_unittest.cc
|
| @@ -491,23 +491,26 @@ TEST(DrawQuadTest, CopyStreamVideoDrawQuad) {
|
| gfx::Rect visible_rect(40, 50, 30, 20);
|
| ResourceId resource_id = 64;
|
| gfx::Size resource_size_in_pixels = gfx::Size(40, 41);
|
| + gfx::BufferFormat format = gfx::BufferFormat::BGRA_8888;
|
| gfx::Transform matrix = gfx::Transform(0.5, 0.25, 1, 0.75, 0, 1);
|
| CREATE_SHARED_STATE();
|
|
|
| - CREATE_QUAD_5_NEW(StreamVideoDrawQuad, opaque_rect, visible_rect, resource_id,
|
| - resource_size_in_pixels, matrix);
|
| + CREATE_QUAD_6_NEW(StreamVideoDrawQuad, opaque_rect, visible_rect, resource_id,
|
| + resource_size_in_pixels, format, matrix);
|
| EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copy_quad->material);
|
| EXPECT_EQ(visible_rect, copy_quad->visible_rect);
|
| EXPECT_EQ(opaque_rect, copy_quad->opaque_rect);
|
| EXPECT_EQ(resource_id, copy_quad->resource_id());
|
| EXPECT_EQ(resource_size_in_pixels, copy_quad->resource_size_in_pixels());
|
| + EXPECT_EQ(format, copy_quad->format);
|
| EXPECT_EQ(matrix, copy_quad->matrix);
|
|
|
| - CREATE_QUAD_3_ALL(StreamVideoDrawQuad, resource_id, resource_size_in_pixels,
|
| - matrix);
|
| + CREATE_QUAD_4_ALL(StreamVideoDrawQuad, resource_id, resource_size_in_pixels,
|
| + format, matrix);
|
| EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copy_quad->material);
|
| EXPECT_EQ(resource_id, copy_quad->resource_id());
|
| EXPECT_EQ(resource_size_in_pixels, copy_quad->resource_size_in_pixels());
|
| + EXPECT_EQ(format, copy_quad->format);
|
| EXPECT_EQ(matrix, copy_quad->matrix);
|
| }
|
|
|
| @@ -784,11 +787,12 @@ TEST_F(DrawQuadIteratorTest, StreamVideoDrawQuad) {
|
| gfx::Rect visible_rect(40, 50, 30, 20);
|
| ResourceId resource_id = 64;
|
| gfx::Size resource_size_in_pixels = gfx::Size(40, 41);
|
| + gfx::BufferFormat format = gfx::BufferFormat::BGRA_8888;
|
| gfx::Transform matrix = gfx::Transform(0.5, 0.25, 1, 0.75, 0, 1);
|
|
|
| CREATE_SHARED_STATE();
|
| - CREATE_QUAD_5_NEW(StreamVideoDrawQuad, opaque_rect, visible_rect, resource_id,
|
| - resource_size_in_pixels, matrix);
|
| + CREATE_QUAD_6_NEW(StreamVideoDrawQuad, opaque_rect, visible_rect, resource_id,
|
| + resource_size_in_pixels, format, matrix);
|
| EXPECT_EQ(resource_id, quad_new->resource_id());
|
| EXPECT_EQ(resource_size_in_pixels, quad_new->resource_size_in_pixels());
|
| EXPECT_EQ(1, IterateAndCount(quad_new));
|
|
|