cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes.

cc/CCRendererGL.h

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #ifndef CCRendererGL_h
 #define CCRendererGL_h
 
 #if USE(ACCELERATED_COMPOSITING)
 
@@ skipping 31 matching lines @@
     static PassOwnPtr<CCRendererGL> create(CCRendererClient*, CCResourceProvider*);
 
     virtual ~CCRendererGL();
 
     virtual const RendererCapabilities& capabilities() const OVERRIDE;
 
     WebKit::WebGraphicsContext3D* context();
 
     virtual void viewportChanged() OVERRIDE;
 
-    const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
-
     // waits for rendering to finish
     virtual void finish() OVERRIDE;
 
     virtual void doNoOp() OVERRIDE;
     // 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 void getFramebufferPixels(void *pixels, const cc::IntRect&) OVERRIDE;
 
     virtual bool isContextLost() OVERRIDE;
 
     virtual void setVisible(bool) OVERRIDE;
 
 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 ccmath::IntRect& framebufferRect) OVERRIDE;
+    virtual void setDrawViewportSize(const ccmath::IntSize&) OVERRIDE;
+    virtual void enableScissorTestRect(const ccmath::IntRect& scissorRect) OVERRIDE;
     virtual void disableScissorTest() OVERRIDE;
     virtual void clearFramebuffer(DrawingFrame&) OVERRIDE;
     virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) OVERRIDE;
     virtual void beginDrawingFrame(DrawingFrame&) OVERRIDE;
     virtual void finishDrawingFrame(DrawingFrame&) OVERRIDE;
     virtual bool flippedFramebuffer() const OVERRIDE;
 
 private:
     static void toGLMatrix(float*, const WebKit::WebTransformationMatrix&);
 
     void drawCheckerboardQuad(const DrawingFrame&, const CCCheckerboardDrawQuad*);
     void drawDebugBorderQuad(const DrawingFrame&, const CCDebugBorderDrawQuad*);
     PassOwnPtr<CCScopedTexture> drawBackgroundFilters(DrawingFrame&, const CCRenderPassDrawQuad*, const WebKit::WebFilterOperations&, const WebKit::WebTransformationMatrix& deviceTransform);
     void drawRenderPassQuad(DrawingFrame&, const CCRenderPassDrawQuad*);
     void drawSolidColorQuad(const DrawingFrame&, const CCSolidColorDrawQuad*);
     void drawStreamVideoQuad(const DrawingFrame&, const CCStreamVideoDrawQuad*);
     void drawTextureQuad(const DrawingFrame&, const CCTextureDrawQuad*);
     void drawIOSurfaceQuad(const DrawingFrame&, const CCIOSurfaceDrawQuad*);
     void drawTileQuad(const DrawingFrame&, const CCTileDrawQuad*);
     void drawYUVVideoQuad(const DrawingFrame&, const CCYUVVideoDrawQuad*);
 
     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 ccmath::FloatRect& quadRect, int matrixLocation);
 
-    void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const IntRect&, const WebKit::WebTransformationMatrix& drawMatrix);
+    void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const ccmath::IntRect&, const WebKit::WebTransformationMatrix& drawMatrix);
 
-    bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& viewportRect);
+    bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const ccmath::IntRect& viewportRect);
 
     bool makeContextCurrent();
 
     bool initializeSharedObjects();
     void cleanupSharedObjects();
 
     // WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM implementation.
     virtual void onSwapBuffersComplete() OVERRIDE;
 
     // WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM implementation.
@@ skipping 80 matching lines @@
     OwnPtr<TextureProgramFlip> m_textureProgramFlip;
     OwnPtr<TextureIOSurfaceProgram> m_textureIOSurfaceProgram;
 
     OwnPtr<VideoYUVProgram> m_videoYUVProgram;
     OwnPtr<VideoStreamTextureProgram> m_videoStreamTextureProgram;
 
     OwnPtr<SolidColorProgram> m_solidColorProgram;
 
     WebKit::WebGraphicsContext3D* m_context;
 
-    IntRect m_swapBufferRect;
+    ccmath::IntRect m_swapBufferRect;
     bool m_isViewportChanged;
     bool m_isFramebufferDiscarded;
     bool m_isUsingBindUniform;
     bool m_visible;
 
     OwnPtr<CCResourceProvider::ScopedWriteLockGL> m_currentFramebufferLock;
 };
 
 
 // Setting DEBUG_GL_CALLS to 1 will call glGetError() after almost every GL
 // call made by the compositor. Useful for debugging rendering issues but
 // will significantly degrade performance.
 #define DEBUG_GL_CALLS 0
 
 #if DEBUG_GL_CALLS && !defined ( NDEBUG )
 #define GLC(context, x) (x, CCRendererGL::debugGLCall(&*context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif