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

cc/CCDirectRenderer.h

 // Copyright 2012 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 CCDirectRenderer_h
 #define CCDirectRenderer_h
 
 #include "CCRenderer.h"
 #include "CCResourceProvider.h"
 #include "CCScopedTexture.h"
@@ skipping 21 matching lines @@
 
     struct DrawingFrame {
         DrawingFrame();
         ~DrawingFrame();
 
         const CCRenderPassIdHashMap* renderPassesById;
         const CCRenderPass* rootRenderPass;
         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 {
         WTF_MAKE_NONCOPYABLE(CachedTexture);
     public:
         static PassOwnPtr<CachedTexture> create(CCResourceProvider* resourceProvider) { return adoptPtr(new CachedTexture(resourceProvider)); }
         virtual ~CachedTexture() { }
 
         bool isComplete() const { return m_isComplete; }
         void setIsComplete(bool isComplete) { m_isComplete = isComplete; }
 
     protected:
         explicit CachedTexture(CCResourceProvider* resourceProvider)
             : CCScopedTexture(resourceProvider)
             , m_isComplete(false)
         {
         }
 
     private:
         bool m_isComplete;
     };
 
     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*);
     static GC3Denum renderPassTextureFormat(const CCRenderPass*);
 
     void drawRenderPass(DrawingFrame&, const CCRenderPass*);
     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;
     virtual void beginDrawingFrame(DrawingFrame&) = 0;
     virtual void finishDrawingFrame(DrawingFrame&) = 0;
     virtual bool flippedFramebuffer() const = 0;
 
     HashMap<CCRenderPass::Id, OwnPtr<CachedTexture> > m_renderPassTextures;
     CCResourceProvider* m_resourceProvider;
 };
 
 }
 
 #endif // CCDirectRenderer_h