| Index: cc/CCRenderPassDrawQuad.h
|
| diff --git a/cc/CCRenderPassDrawQuad.h b/cc/CCRenderPassDrawQuad.h
|
| index 0bffc351cbc1a82bd3bfdc51e0a9bde45905afa4..3f01f96da9cc6b504c44292a02ba07d756a07ec5 100644
|
| --- a/cc/CCRenderPassDrawQuad.h
|
| +++ b/cc/CCRenderPassDrawQuad.h
|
| @@ -8,7 +8,6 @@
|
| #include "CCDrawQuad.h"
|
| #include "CCRenderPass.h"
|
| #include "CCResourceProvider.h"
|
| -#include "IntRect.h"
|
| #include <wtf/PassOwnPtr.h>
|
|
|
| namespace cc {
|
| @@ -16,12 +15,12 @@ namespace cc {
|
| class CCRenderPassDrawQuad : public CCDrawQuad {
|
| WTF_MAKE_NONCOPYABLE(CCRenderPassDrawQuad);
|
| public:
|
| - static PassOwnPtr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
| + static PassOwnPtr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const ccmath::IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const ccmath::IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
|
|
| CCRenderPass::Id renderPassId() const { return m_renderPassId; }
|
| bool isReplica() const { return m_isReplica; }
|
| CCResourceProvider::ResourceId maskResourceId() const { return m_maskResourceId; }
|
| - const IntRect& contentsChangedSinceLastFrame() const { return m_contentsChangedSinceLastFrame; }
|
| + const ccmath::IntRect& contentsChangedSinceLastFrame() const { return m_contentsChangedSinceLastFrame; }
|
|
|
| static const CCRenderPassDrawQuad* materialCast(const CCDrawQuad*);
|
| float maskTexCoordScaleX() const { return m_maskTexCoordScaleX; }
|
| @@ -32,12 +31,12 @@ public:
|
| PassOwnPtr<CCRenderPassDrawQuad> copy(const CCSharedQuadState* copiedSharedQuadState, CCRenderPass::Id copiedRenderPassId) const;
|
|
|
| private:
|
| - CCRenderPassDrawQuad(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
| + CCRenderPassDrawQuad(const CCSharedQuadState*, const ccmath::IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const ccmath::IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
|
|
| CCRenderPass::Id m_renderPassId;
|
| bool m_isReplica;
|
| CCResourceProvider::ResourceId m_maskResourceId;
|
| - IntRect m_contentsChangedSinceLastFrame;
|
| + ccmath::IntRect m_contentsChangedSinceLastFrame;
|
| float m_maskTexCoordScaleX;
|
| float m_maskTexCoordScaleY;
|
| float m_maskTexCoordOffsetX;
|
|
|