Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
diff --git a/cc/quads/picture_draw_quad.cc b/cc/quads/picture_draw_quad.cc
index 8fda699..81f7913 100644
--- a/cc/quads/picture_draw_quad.cc
+++ b/cc/quads/picture_draw_quad.cc
@@ -24,12 +24,14 @@
bool swizzle_contents,
gfx::Rect content_rect,
float contents_scale,
+ bool can_draw_direct_to_backbuffer,
scoped_refptr<PicturePileImpl> picture_pile) {
ContentDrawQuadBase::SetNew(shared_quad_state, DrawQuad::PICTURE_CONTENT,
rect, opaque_rect, tex_coord_rect, texture_size,
swizzle_contents);
this->content_rect = content_rect;
this->contents_scale = contents_scale;
+ this->can_draw_direct_to_backbuffer = can_draw_direct_to_backbuffer;
this->picture_pile = picture_pile;
}
@@ -43,6 +45,7 @@
bool swizzle_contents,
gfx::Rect content_rect,
float contents_scale,
+ bool can_draw_direct_to_backbuffer,
scoped_refptr<PicturePileImpl> picture_pile) {
ContentDrawQuadBase::SetAll(shared_quad_state,
DrawQuad::PICTURE_CONTENT, rect, opaque_rect,
@@ -50,6 +53,7 @@
texture_size, swizzle_contents);
this->content_rect = content_rect;
this->contents_scale = contents_scale;
+ this->can_draw_direct_to_backbuffer = can_draw_direct_to_backbuffer;
this->picture_pile = picture_pile;
}