| Index: cc/CCDirectRenderer.h
|
| diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
|
| index e11d1d744e81db4dc2eaa164995adf06deeb861d..ddcf352419f9821c73092d6966bced90b773dbf3 100644
|
| --- a/cc/CCDirectRenderer.h
|
| +++ b/cc/CCDirectRenderer.h
|
| @@ -39,12 +39,12 @@ protected:
|
| const CCRenderPass* currentRenderPass;
|
| const CCScopedTexture* currentTexture;
|
|
|
| - FloatRect rootDamageRect;
|
| + ccmath::FloatRect rootDamageRect;
|
|
|
| WebKit::WebTransformationMatrix projectionMatrix;
|
| WebKit::WebTransformationMatrix windowMatrix;
|
| bool flippedY;
|
| - FloatRect scissorRectInRenderPassSpace;
|
| + ccmath::FloatRect scissorRectInRenderPassSpace;
|
| };
|
|
|
| class CachedTexture : public CCScopedTexture {
|
| @@ -68,9 +68,9 @@ protected:
|
| };
|
|
|
| static FloatRect quadVertexRect();
|
| - static void quadRectTransform(WebKit::WebTransformationMatrix* quadRectTransform, const WebKit::WebTransformationMatrix& quadTransform, const FloatRect& quadRect);
|
| - static void initializeMatrices(DrawingFrame&, const IntRect& drawRect, bool flipY);
|
| - static IntRect moveScissorToWindowSpace(const DrawingFrame&, FloatRect scissorRect);
|
| + static void quadRectTransform(WebKit::WebTransformationMatrix* quadRectTransform, const WebKit::WebTransformationMatrix& quadTransform, const ccmath::FloatRect& quadRect);
|
| + static void initializeMatrices(DrawingFrame&, const ccmath::IntRect& drawRect, bool flipY);
|
| + static ccmath::IntRect moveScissorToWindowSpace(const DrawingFrame&, ccmath::FloatRect scissorRect);
|
|
|
| bool haveCachedResources(CCRenderPass::Id) const;
|
| static IntSize renderPassTextureSize(const CCRenderPass*);
|
| @@ -80,9 +80,9 @@ protected:
|
| bool useRenderPass(DrawingFrame&, const CCRenderPass*);
|
|
|
| virtual void bindFramebufferToOutputSurface(DrawingFrame&) = 0;
|
| - virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& framebufferRect) = 0;
|
| - virtual void setDrawViewportSize(const IntSize&) = 0;
|
| - virtual void enableScissorTestRect(const IntRect& scissorRect) = 0;
|
| + virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const ccmath::IntRect& framebufferRect) = 0;
|
| + virtual void setDrawViewportSize(const ccmath::IntSize&) = 0;
|
| + virtual void enableScissorTestRect(const ccmath::IntRect& scissorRect) = 0;
|
| virtual void disableScissorTest() = 0;
|
| virtual void clearFramebuffer(DrawingFrame&) = 0;
|
| virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) = 0;
|
|
|