diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 04:12:41 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 04:12:41 +0000 |
| commit | 1fea814130ff23de709fe242819d67b9d4344e07 (patch) | |
| tree | 6b9f06266db7ea814bc597ffb7fea731fb77904e /cc/direct_renderer.h | |
| parent | efd25e631eba64162229c4aee56413a4a0fd7549 (diff) | |
| download | chromium_src-1fea814130ff23de709fe242819d67b9d4344e07.zip chromium_src-1fea814130ff23de709fe242819d67b9d4344e07.tar.gz chromium_src-1fea814130ff23de709fe242819d67b9d4344e07.tar.bz2 | |
cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes.
We use these geometry types for CCDrawQuad types and in CCRenderPass, and so
we also make use of them in the CCRenderer classes.
A minor number of copies back to cc:: (WebCore) geometry types do occur in
the renderer implementations for now until we migrate the rest of the compositor.
Covered by existing tests.
BUG=152473
R=enne,jamesr
Review URL: https://chromiumcodereview.appspot.com/10984053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/direct_renderer.h')
| -rw-r--r-- | cc/direct_renderer.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cc/direct_renderer.h b/cc/direct_renderer.h index edf4001..2744f6a 100644 --- a/cc/direct_renderer.h +++ b/cc/direct_renderer.h @@ -39,12 +39,12 @@ protected: const CCRenderPass* currentRenderPass; const CCScopedTexture* currentTexture; - FloatRect rootDamageRect; + gfx::RectF rootDamageRect; WebKit::WebTransformationMatrix projectionMatrix; WebKit::WebTransformationMatrix windowMatrix; bool flippedY; - FloatRect scissorRectInRenderPassSpace; + gfx::RectF scissorRectInRenderPassSpace; }; class CachedTexture : public CCScopedTexture { @@ -71,9 +71,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 gfx::RectF& quadRect); + static void initializeMatrices(DrawingFrame&, const gfx::Rect& drawRect, bool flipY); + static gfx::Rect moveScissorToWindowSpace(const DrawingFrame&, gfx::RectF scissorRect); bool haveCachedResources(CCRenderPass::Id) const; static IntSize renderPassTextureSize(const CCRenderPass*); @@ -83,9 +83,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 gfx::Rect& framebufferRect) = 0; + virtual void setDrawViewportSize(const gfx::Size&) = 0; + virtual void enableScissorTestRect(const gfx::Rect& scissorRect) = 0; virtual void disableScissorTest() = 0; virtual void clearFramebuffer(DrawingFrame&) = 0; virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) = 0; |