| Index: cc/render_pass_draw_quad.h
|
| diff --git a/cc/render_pass_draw_quad.h b/cc/render_pass_draw_quad.h
|
| index 99222d9edb83c4bcedca424f85fe43ad40f4a275..9bc9ee9509e2b4d045e4e92f01a6dd41ba20fd3b 100644
|
| --- a/cc/render_pass_draw_quad.h
|
| +++ b/cc/render_pass_draw_quad.h
|
| @@ -10,18 +10,17 @@
|
| #include "CCDrawQuad.h"
|
| #include "CCRenderPass.h"
|
| #include "CCResourceProvider.h"
|
| -#include "IntRect.h"
|
|
|
| namespace cc {
|
|
|
| class CCRenderPassDrawQuad : public CCDrawQuad {
|
| public:
|
| - static scoped_ptr<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 scoped_ptr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const gfx::Rect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const gfx::Rect& 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 gfx::Rect& contentsChangedSinceLastFrame() const { return m_contentsChangedSinceLastFrame; }
|
|
|
| static const CCRenderPassDrawQuad* materialCast(const CCDrawQuad*);
|
| float maskTexCoordScaleX() const { return m_maskTexCoordScaleX; }
|
| @@ -32,12 +31,12 @@ public:
|
| scoped_ptr<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 gfx::Rect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const gfx::Rect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
|
|
| CCRenderPass::Id m_renderPassId;
|
| bool m_isReplica;
|
| CCResourceProvider::ResourceId m_maskResourceId;
|
| - IntRect m_contentsChangedSinceLastFrame;
|
| + gfx::Rect m_contentsChangedSinceLastFrame;
|
| float m_maskTexCoordScaleX;
|
| float m_maskTexCoordScaleY;
|
| float m_maskTexCoordOffsetX;
|
|
|