Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1159)

Unified Diff: cc/gl_renderer.h

Issue 10984053: cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/draw_quad_unittest.cc ('k') | cc/gl_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/gl_renderer.h
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index e6d1652e937bb6e5fd0bdc22a867d3a84ceb5da5..a255c9fc3f7cd89601519960b09141cb86eb7c14 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -43,8 +43,6 @@ public:
virtual void viewportChanged() OVERRIDE;
- const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
-
// waits for rendering to finish
virtual void finish() OVERRIDE;
@@ -52,12 +50,7 @@ public:
// puts backbuffer onscreen
virtual bool swapBuffers() OVERRIDE;
- static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
-
- const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
-
virtual void getFramebufferPixels(void *pixels, const IntRect&) OVERRIDE;
- bool getFramebufferTexture(CCScopedTexture*, const IntRect& deviceRect);
virtual bool isContextLost() OVERRIDE;
@@ -66,15 +59,21 @@ public:
protected:
CCRendererGL(CCRendererClient*, CCResourceProvider*);
+ static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
+
bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
bool initialize();
+ const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
+ const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
+
+ bool getFramebufferTexture(CCScopedTexture*, const IntRect& deviceRect);
void releaseRenderPassTextures();
virtual void bindFramebufferToOutputSurface(DrawingFrame&) OVERRIDE;
- virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& framebufferRect) OVERRIDE;
- virtual void setDrawViewportSize(const IntSize&) OVERRIDE;
- virtual void enableScissorTestRect(const IntRect& scissorRect) OVERRIDE;
+ virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const gfx::Rect& framebufferRect) OVERRIDE;
+ virtual void setDrawViewportSize(const gfx::Size&) OVERRIDE;
+ virtual void enableScissorTestRect(const gfx::Rect& scissorRect) OVERRIDE;
virtual void disableScissorTest() OVERRIDE;
virtual void clearFramebuffer(DrawingFrame&) OVERRIDE;
virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) OVERRIDE;
@@ -98,11 +97,11 @@ private:
void setShaderOpacity(float opacity, int alphaLocation);
void setShaderFloatQuad(const FloatQuad&, int quadLocation);
- void drawQuadGeometry(const DrawingFrame&, const WebKit::WebTransformationMatrix& drawTransform, const FloatRect& quadRect, int matrixLocation);
+ void drawQuadGeometry(const DrawingFrame&, const WebKit::WebTransformationMatrix& drawTransform, const gfx::RectF& quadRect, int matrixLocation);
- void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const IntRect&, const WebKit::WebTransformationMatrix& drawMatrix);
+ void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const WebKit::WebTransformationMatrix& drawMatrix);
- bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& viewportRect);
+ bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const gfx::Rect& viewportRect);
bool makeContextCurrent();
@@ -204,7 +203,7 @@ private:
WebKit::WebGraphicsContext3D* m_context;
- IntRect m_swapBufferRect;
+ gfx::Rect m_swapBufferRect;
bool m_isViewportChanged;
bool m_isFramebufferDiscarded;
bool m_discardFramebufferWhenNotVisible;
« no previous file with comments | « cc/draw_quad_unittest.cc ('k') | cc/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698