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

1 files changed, 5 insertions, 5 deletions

diff --git a/cc/texture_draw_quad.h b/cc/texture_draw_quad.h
index daa600f..0c5736e 100644
--- a/cc/texture_draw_quad.h
+++ b/cc/texture_draw_quad.h
@@ -6,8 +6,8 @@
 #define CCTextureDrawQuad_h
 
 #include "CCDrawQuad.h"
-#include "FloatRect.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/rect_f.h"
 
 namespace cc {
 
@@ -15,8 +15,8 @@ namespace cc {
 
 class CCTextureDrawQuad : public CCDrawQuad {
 public:
-    static scoped_ptr<CCTextureDrawQuad> create(const CCSharedQuadState*, const IntRect&, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped);
-    FloatRect uvRect() const { return m_uvRect; }
+    static scoped_ptr<CCTextureDrawQuad> create(const CCSharedQuadState*, const gfx::Rect&, unsigned resourceId, bool premultipliedAlpha, const gfx::RectF& uvRect, bool flipped);
+    gfx::RectF uvRect() const { return m_uvRect; }
 
     unsigned resourceId() const { return m_resourceId; }
     bool premultipliedAlpha() const { return  m_premultipliedAlpha; }
@@ -26,11 +26,11 @@ public:
 
     static const CCTextureDrawQuad* materialCast(const CCDrawQuad*);
 private:
-    CCTextureDrawQuad(const CCSharedQuadState*, const IntRect&, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped);
+    CCTextureDrawQuad(const CCSharedQuadState*, const gfx::Rect&, unsigned resourceId, bool premultipliedAlpha, const gfx::RectF& uvRect, bool flipped);
 
     unsigned m_resourceId;
     bool m_premultipliedAlpha;
-    FloatRect m_uvRect;
+    gfx::RectF m_uvRect;
     bool m_flipped;
 };