| 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..483751985236f3cd10b0bfae1aecc95d718cb324 100644
|
| --- a/cc/render_pass_draw_quad.h
|
| +++ b/cc/render_pass_draw_quad.h
|
| @@ -14,36 +14,36 @@
|
|
|
| namespace cc {
|
|
|
| -class CCRenderPassDrawQuad : public CCDrawQuad {
|
| +class RenderPassDrawQuad : public DrawQuad {
|
| 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<RenderPassDrawQuad> create(const SharedQuadState*, const IntRect&, RenderPass::Id renderPassId, bool isReplica, ResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
|
|
| - CCRenderPass::Id renderPassId() const { return m_renderPassId; }
|
| + RenderPass::Id renderPassId() const { return m_renderPassId; }
|
| bool isReplica() const { return m_isReplica; }
|
| - CCResourceProvider::ResourceId maskResourceId() const { return m_maskResourceId; }
|
| + ResourceProvider::ResourceId maskResourceId() const { return m_maskResourceId; }
|
| const IntRect& contentsChangedSinceLastFrame() const { return m_contentsChangedSinceLastFrame; }
|
|
|
| - static const CCRenderPassDrawQuad* materialCast(const CCDrawQuad*);
|
| + static const RenderPassDrawQuad* materialCast(const DrawQuad*);
|
| float maskTexCoordScaleX() const { return m_maskTexCoordScaleX; }
|
| float maskTexCoordScaleY() const { return m_maskTexCoordScaleY; }
|
| float maskTexCoordOffsetX() const { return m_maskTexCoordOffsetX; }
|
| float maskTexCoordOffsetY() const { return m_maskTexCoordOffsetY; }
|
|
|
| - scoped_ptr<CCRenderPassDrawQuad> copy(const CCSharedQuadState* copiedSharedQuadState, CCRenderPass::Id copiedRenderPassId) const;
|
| + scoped_ptr<RenderPassDrawQuad> copy(const SharedQuadState* copiedSharedQuadState, RenderPass::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);
|
| + RenderPassDrawQuad(const SharedQuadState*, const IntRect&, RenderPass::Id renderPassId, bool isReplica, ResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
|
|
|
| - CCRenderPass::Id m_renderPassId;
|
| + RenderPass::Id m_renderPassId;
|
| bool m_isReplica;
|
| - CCResourceProvider::ResourceId m_maskResourceId;
|
| + ResourceProvider::ResourceId m_maskResourceId;
|
| IntRect m_contentsChangedSinceLastFrame;
|
| float m_maskTexCoordScaleX;
|
| float m_maskTexCoordScaleY;
|
| float m_maskTexCoordOffsetX;
|
| float m_maskTexCoordOffsetY;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(CCRenderPassDrawQuad);
|
| + DISALLOW_COPY_AND_ASSIGN(RenderPassDrawQuad);
|
| };
|
|
|
| }
|
|
|