| Index: cc/texture_draw_quad.cc
|
| diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc
|
| index 1bed6be1564bdf4dbecd91b0fa0c600c8d682ae0..65ea4101b618e3aa60bfb47adf4da97b43820d99 100644
|
| --- a/cc/texture_draw_quad.cc
|
| +++ b/cc/texture_draw_quad.cc
|
| @@ -14,17 +14,19 @@ scoped_ptr<TextureDrawQuad> TextureDrawQuad::create(const SharedQuadState* share
|
| }
|
|
|
| TextureDrawQuad::TextureDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, bool premultipliedAlpha, const gfx::RectF& uvRect, bool flipped)
|
| - : DrawQuad(sharedQuadState, DrawQuad::TEXTURE_CONTENT, quadRect, opaqueRect)
|
| - , m_resourceId(resourceId)
|
| + : m_resourceId(resourceId)
|
| , m_premultipliedAlpha(premultipliedAlpha)
|
| , m_uvRect(uvRect)
|
| , m_flipped(flipped)
|
| {
|
| + gfx::Rect visibleRect = quadRect;
|
| + bool needsBlending = false;
|
| + DrawQuad::SetAll(sharedQuadState, DrawQuad::TEXTURE_CONTENT, quadRect, opaqueRect, visibleRect, needsBlending);
|
| }
|
|
|
| const TextureDrawQuad* TextureDrawQuad::materialCast(const DrawQuad* quad)
|
| {
|
| - DCHECK(quad->material() == DrawQuad::TEXTURE_CONTENT);
|
| + DCHECK(quad->material == DrawQuad::TEXTURE_CONTENT);
|
| return static_cast<const TextureDrawQuad*>(quad);
|
| }
|
|
|
|
|