| Index: cc/CCDrawQuad.cpp
|
| diff --git a/cc/CCDrawQuad.cpp b/cc/CCDrawQuad.cpp
|
| index b3c3889ec3cfb4b3ab26abf2049ada196be4cb10..8133a089148e1ea5c92357af09bfd7e85a2e03ab 100644
|
| --- a/cc/CCDrawQuad.cpp
|
| +++ b/cc/CCDrawQuad.cpp
|
| @@ -14,11 +14,10 @@
|
| #include "CCTextureDrawQuad.h"
|
| #include "CCTileDrawQuad.h"
|
| #include "CCYUVVideoDrawQuad.h"
|
| -#include "IntRect.h"
|
|
|
| namespace cc {
|
|
|
| -CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material material, const IntRect& quadRect)
|
| +CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material material, const ccmath::IntRect& quadRect)
|
| : m_sharedQuadState(sharedQuadState)
|
| , m_sharedQuadStateId(sharedQuadState->id)
|
| , m_material(material)
|
| @@ -31,19 +30,19 @@ CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material materi
|
| ASSERT(m_material != Invalid);
|
| }
|
|
|
| -IntRect CCDrawQuad::opaqueRect() const
|
| +ccmath::IntRect CCDrawQuad::opaqueRect() const
|
| {
|
| if (opacity() != 1)
|
| - return IntRect();
|
| + return ccmath::IntRect();
|
| if (m_sharedQuadState->opaque && m_quadOpaque)
|
| return m_quadRect;
|
| return m_opaqueRect;
|
| }
|
|
|
| -void CCDrawQuad::setQuadVisibleRect(const IntRect& quadVisibleRect)
|
| +void CCDrawQuad::setQuadVisibleRect(const ccmath::IntRect& quadVisibleRect)
|
| {
|
| - IntRect intersection = quadVisibleRect;
|
| - intersection.intersect(m_quadRect);
|
| + ccmath::IntRect intersection = quadVisibleRect;
|
| + intersection.Intersect(m_quadRect);
|
| m_quadVisibleRect = intersection;
|
| }
|
|
|
|
|