| Index: cc/CCRenderPassDrawQuad.h
|
| diff --git a/cc/CCRenderPassDrawQuad.h b/cc/CCRenderPassDrawQuad.h
|
| index 504e6e1138ba9d3c2643a60191bd114f80799a04..cca33862246a4c47fb65b598a8dba0406013a045 100644
|
| --- a/cc/CCRenderPassDrawQuad.h
|
| +++ b/cc/CCRenderPassDrawQuad.h
|
| @@ -6,20 +6,19 @@
|
| #define CCRenderPassDrawQuad_h
|
|
|
| #include "CCDrawQuad.h"
|
| +#include "CCRenderPass.h"
|
| #include "CCResourceProvider.h"
|
| #include "IntRect.h"
|
| #include <wtf/PassOwnPtr.h>
|
|
|
| namespace WebCore {
|
|
|
| -class CCRenderPass;
|
| -
|
| class CCRenderPassDrawQuad : public CCDrawQuad {
|
| WTF_MAKE_NONCOPYABLE(CCRenderPassDrawQuad);
|
| public:
|
| - static PassOwnPtr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const IntRect&, int renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
| + 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);
|
|
|
| - int renderPassId() const { return m_renderPassId; }
|
| + 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; }
|
| @@ -30,10 +29,12 @@ public:
|
| float maskTexCoordOffsetX() const { return m_maskTexCoordOffsetX; }
|
| float maskTexCoordOffsetY() const { return m_maskTexCoordOffsetY; }
|
|
|
| + PassOwnPtr<CCRenderPassDrawQuad> copy(const CCSharedQuadState* copiedSharedQuadState, CCRenderPass::Id copiedRenderPassId) const;
|
| +
|
| private:
|
| - CCRenderPassDrawQuad(const CCSharedQuadState*, const IntRect&, int renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
| + CCRenderPassDrawQuad(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
|
|
| - int m_renderPassId;
|
| + CCRenderPass::Id m_renderPassId;
|
| bool m_isReplica;
|
| CCResourceProvider::ResourceId m_maskResourceId;
|
| IntRect m_contentsChangedSinceLastFrame;
|
|
|