| Index: cc/CCDrawQuad.cpp
|
| diff --git a/cc/CCDrawQuad.cpp b/cc/CCDrawQuad.cpp
|
| index b88eac68610a4a01ab19ec3619f574e54d806494..816433155a548749ac4716162c42cf90a2371be3 100644
|
| --- a/cc/CCDrawQuad.cpp
|
| +++ b/cc/CCDrawQuad.cpp
|
| @@ -18,7 +18,7 @@
|
|
|
| namespace cc {
|
|
|
| -CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material material, const IntRect& quadRect)
|
| +CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material material, const WebKit::WebRect& quadRect)
|
| : m_sharedQuadState(sharedQuadState)
|
| , m_sharedQuadStateId(sharedQuadState->id)
|
| , m_material(material)
|
| @@ -31,19 +31,25 @@ CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material materi
|
| ASSERT(m_material != Invalid);
|
| }
|
|
|
| -IntRect CCDrawQuad::opaqueRect() const
|
| +WebKit::WebRect CCDrawQuad::opaqueRect() const
|
| {
|
| if (opacity() != 1)
|
| - return IntRect();
|
| + return WebKit::WebRect();
|
| if (m_sharedQuadState->opaque && m_quadOpaque)
|
| return m_quadRect;
|
| return m_opaqueRect;
|
| }
|
|
|
| -void CCDrawQuad::setQuadVisibleRect(const IntRect& quadVisibleRect)
|
| +// FIXME: Move this back to the header file when we are no longer using WebRect.
|
| +bool CCDrawQuad::needsBlending() const
|
| +{
|
| + return m_needsBlending || !static_cast<IntRect>(opaqueRect()).contains(static_cast<IntRect>(m_quadVisibleRect));
|
| +}
|
| +
|
| +void CCDrawQuad::setQuadVisibleRect(const WebKit::WebRect& quadVisibleRect)
|
| {
|
| IntRect intersection = quadVisibleRect;
|
| - intersection.intersect(m_quadRect);
|
| + intersection.intersect(static_cast<IntRect>(m_quadRect));
|
| m_quadVisibleRect = intersection;
|
| }
|
|
|
|
|