| Index: cc/quads/draw_quad_unittest.cc
|
| diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
|
| index 9b5c8fdb90ced5e8d5cbdf233e8a701b0d51ae40..b5a3c4c132c7f9993fdd92d13dab7b511b825c06 100644
|
| --- a/cc/quads/draw_quad_unittest.cc
|
| +++ b/cc/quads/draw_quad_unittest.cc
|
| @@ -654,16 +654,18 @@ TEST(DrawQuadTest, CopyPictureDrawQuad) {
|
| bool swizzle_contents = true;
|
| gfx::Rect content_rect(30, 40, 20, 30);
|
| float contents_scale = 3.141592f;
|
| + bool draw_direct_to_backbuffer = true;
|
| scoped_refptr<PicturePileImpl> picture_pile = PicturePileImpl::Create(false);
|
| CREATE_SHARED_STATE();
|
|
|
| - CREATE_QUAD_7_NEW(PictureDrawQuad,
|
| + CREATE_QUAD_8_NEW(PictureDrawQuad,
|
| opaque_rect,
|
| tex_coord_rect,
|
| texture_size,
|
| swizzle_contents,
|
| content_rect,
|
| contents_scale,
|
| + draw_direct_to_backbuffer,
|
| picture_pile);
|
| EXPECT_EQ(DrawQuad::PICTURE_CONTENT, copy_quad->material);
|
| EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect);
|
| @@ -672,14 +674,16 @@ TEST(DrawQuadTest, CopyPictureDrawQuad) {
|
| EXPECT_EQ(swizzle_contents, copy_quad->swizzle_contents);
|
| EXPECT_RECT_EQ(content_rect, copy_quad->content_rect);
|
| EXPECT_EQ(contents_scale, copy_quad->contents_scale);
|
| + EXPECT_EQ(draw_direct_to_backbuffer, copy_quad->draw_direct_to_backbuffer);
|
| EXPECT_EQ(picture_pile, copy_quad->picture_pile);
|
|
|
| - CREATE_QUAD_6_ALL(PictureDrawQuad,
|
| + CREATE_QUAD_7_ALL(PictureDrawQuad,
|
| tex_coord_rect,
|
| texture_size,
|
| swizzle_contents,
|
| content_rect,
|
| contents_scale,
|
| + draw_direct_to_backbuffer,
|
| picture_pile);
|
| EXPECT_EQ(DrawQuad::PICTURE_CONTENT, copy_quad->material);
|
| EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect);
|
| @@ -687,6 +691,7 @@ TEST(DrawQuadTest, CopyPictureDrawQuad) {
|
| EXPECT_EQ(swizzle_contents, copy_quad->swizzle_contents);
|
| EXPECT_RECT_EQ(content_rect, copy_quad->content_rect);
|
| EXPECT_EQ(contents_scale, copy_quad->contents_scale);
|
| + EXPECT_EQ(draw_direct_to_backbuffer, copy_quad->draw_direct_to_backbuffer);
|
| EXPECT_EQ(picture_pile, copy_quad->picture_pile);
|
| }
|
|
|
| @@ -869,16 +874,18 @@ TEST_F(DrawQuadIteratorTest, DISABLED_PictureDrawQuad) {
|
| bool swizzle_contents = true;
|
| gfx::Rect content_rect(30, 40, 20, 30);
|
| float contents_scale = 3.141592f;
|
| + bool draw_direct_to_backbuffer = true;
|
| scoped_refptr<PicturePileImpl> picture_pile = PicturePileImpl::Create(false);
|
|
|
| CREATE_SHARED_STATE();
|
| - CREATE_QUAD_7_NEW(PictureDrawQuad,
|
| + CREATE_QUAD_8_NEW(PictureDrawQuad,
|
| opaque_rect,
|
| tex_coord_rect,
|
| texture_size,
|
| swizzle_contents,
|
| content_rect,
|
| contents_scale,
|
| + draw_direct_to_backbuffer,
|
| picture_pile);
|
| EXPECT_EQ(0, IterateAndCount(quad_new.get()));
|
| }
|
|
|