Index: cc/tile_draw_quad.cc |
diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc |
index 13b1d33622498204bffee0524335847042ecb4aa..e9a2398852d640a5f0416325176dc4e2a7ac1213 100644 |
--- a/cc/tile_draw_quad.cc |
+++ b/cc/tile_draw_quad.cc |
@@ -27,7 +27,7 @@ void TileDrawQuad::SetNew(const SharedQuadState* shared_quad_state, |
bool swizzle_contents) { |
gfx::Rect visible_rect = rect; |
bool needs_blending = false; |
- DrawQuad::SetAll(shared_quad_state, DrawQuad::TILED_CONTENT, rect, |
+ DrawQuad::SetAll(shared_quad_state, material(), rect, |
opaque_rect, visible_rect, needs_blending); |
this->resource_id = resource_id; |
this->tex_coord_rect = tex_coord_rect; |
@@ -44,7 +44,7 @@ void TileDrawQuad::SetAll(const SharedQuadState* shared_quad_state, |
const gfx::RectF& tex_coord_rect, |
gfx::Size texture_size, |
bool swizzle_contents) { |
- DrawQuad::SetAll(shared_quad_state, DrawQuad::TILED_CONTENT, rect, |
+ DrawQuad::SetAll(shared_quad_state, material(), rect, |
opaque_rect, visible_rect, needs_blending); |
this->resource_id = resource_id; |
this->tex_coord_rect = tex_coord_rect; |
@@ -52,6 +52,14 @@ void TileDrawQuad::SetAll(const SharedQuadState* shared_quad_state, |
this->swizzle_contents = swizzle_contents; |
} |
+bool TileDrawQuad::IsPictureQuad() const { |
danakj
2013/03/14 18:00:56
this is redundant with the quad's |material| field
Leandro GraciĆ” Gil
2013/03/19 17:30:07
Removed.
|
+ return false; |
+} |
+ |
+DrawQuad::Material TileDrawQuad::material() const { |
+ return DrawQuad::TILED_CONTENT; |
+} |
+ |
void TileDrawQuad::IterateResources( |
const ResourceIteratorCallback& callback) { |
resource_id = callback.Run(resource_id); |