| Index: cc/CCTileDrawQuad.h
|
| diff --git a/cc/CCTileDrawQuad.h b/cc/CCTileDrawQuad.h
|
| index c9dadb7f7ef2f6a44f2f115c0b2596eb747ad77f..f6f02f64bb4bccb5211c077c93e49021a2dafdf2 100644
|
| --- a/cc/CCTileDrawQuad.h
|
| +++ b/cc/CCTileDrawQuad.h
|
| @@ -7,8 +7,8 @@
|
|
|
| #include "CCDrawQuad.h"
|
| #include "GraphicsTypes3D.h"
|
| -#include "IntPoint.h"
|
| -#include "IntSize.h"
|
| +#include "cc/math/int_point.h"
|
| +#include "cc/math/int_size.h"
|
| #include <wtf/PassOwnPtr.h>
|
|
|
| namespace cc {
|
| @@ -17,11 +17,11 @@ namespace cc {
|
|
|
| class CCTileDrawQuad : public CCDrawQuad {
|
| public:
|
| - static PassOwnPtr<CCTileDrawQuad> create(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
| + static PassOwnPtr<CCTileDrawQuad> create(const CCSharedQuadState*, const ccmath::IntRect& quadRect, const ccmath::IntRect& opaqueRect, unsigned resourceId, const ccmath::IntPoint& textureOffset, const ccmath::IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
|
|
| unsigned resourceId() const { return m_resourceId; }
|
| - IntPoint textureOffset() const { return m_textureOffset; }
|
| - IntSize textureSize() const { return m_textureSize; }
|
| + ccmath::IntPoint textureOffset() const { return m_textureOffset; }
|
| + ccmath::IntSize textureSize() const { return m_textureSize; }
|
| GC3Dint textureFilter() const { return m_textureFilter; }
|
| bool swizzleContents() const { return m_swizzleContents; }
|
|
|
| @@ -34,11 +34,11 @@ public:
|
|
|
| static const CCTileDrawQuad* materialCast(const CCDrawQuad*);
|
| private:
|
| - CCTileDrawQuad(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
| + CCTileDrawQuad(const CCSharedQuadState*, const ccmath::IntRect& quadRect, const ccmath::IntRect& opaqueRect, unsigned resourceId, const ccmath::IntPoint& textureOffset, const ccmath::IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
|
|
| unsigned m_resourceId;
|
| - IntPoint m_textureOffset;
|
| - IntSize m_textureSize;
|
| + ccmath::IntPoint m_textureOffset;
|
| + ccmath::IntSize m_textureSize;
|
| GC3Dint m_textureFilter;
|
| bool m_swizzleContents;
|
| bool m_leftEdgeAA;
|
|
|