| Index: cc/draw_quad.cc
|
| diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
|
| index aba2412160f9e68a43a5fdcd123c2d7c838aaefa..805561b394affd023f407d0ad01f36ecee58cba3 100644
|
| --- a/cc/draw_quad.cc
|
| +++ b/cc/draw_quad.cc
|
| @@ -25,14 +25,14 @@ template<typename T> T* TypedCopy(const cc::DrawQuad* other) {
|
|
|
| namespace cc {
|
|
|
| -DrawQuad::DrawQuad(const SharedQuadState* sharedQuadState, Material material, const gfx::Rect& quadRect)
|
| +DrawQuad::DrawQuad(const SharedQuadState* sharedQuadState, Material material, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect)
|
| : m_sharedQuadState(sharedQuadState)
|
| , m_sharedQuadStateId(sharedQuadState->id)
|
| , m_material(material)
|
| , m_quadRect(quadRect)
|
| , m_quadVisibleRect(quadRect)
|
| - , m_quadOpaque(true)
|
| , m_needsBlending(false)
|
| + , m_opaqueRect(opaqueRect)
|
| {
|
| DCHECK(m_sharedQuadState);
|
| DCHECK(m_material != INVALID);
|
| @@ -42,8 +42,6 @@ gfx::Rect DrawQuad::opaqueRect() const
|
| {
|
| if (opacity() != 1)
|
| return gfx::Rect();
|
| - if (m_sharedQuadState->opaque && m_quadOpaque)
|
| - return m_quadRect;
|
| return m_opaqueRect;
|
| }
|
|
|
|
|