cc: Use gfx:: Geometry types for positions, bounds, and related things.

This covers layers, layer tree hosts, and related classes. *phew*

I intentionally avoided anything to do with scrolling or page scale. Those
should be changed to be Vectors and need a bit more thought. This change
should be pretty mindless.

It converts to gfx Rect, Size, Vector, and Point classes. No change is
made for FloatPoint3D or FloatQuad yet.

I've added cc/geometry.h as a place for free functions that don't exist
on gfx types yet, and that we should port over in the future.

No change in behaviour; covered by existing tests.

BUG=147395
R=enne

Review URL: https://codereview.chromium.org/11264056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165434 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/cc/font_atlas.h b/cc/font_atlas.h
index 1858c12..0a227a6 100644
--- a/cc/font_atlas.h
+++ b/cc/font_atlas.h
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "IntRect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/rect.h"
 
 class SkCanvas;
 
@@ -24,7 +24,7 @@ namespace cc {
 // This class provides basic ability to draw text onto the heads-up display.
 class FontAtlas {
 public:
-    static scoped_ptr<FontAtlas> create(SkBitmap bitmap, IntRect asciiToRectTable[128], int fontHeight)
+    static scoped_ptr<FontAtlas> create(SkBitmap bitmap, gfx::Rect asciiToRectTable[128], int fontHeight)
     {
         return make_scoped_ptr(new FontAtlas(bitmap, asciiToRectTable, fontHeight));
     }
@@ -42,15 +42,15 @@ public:
     void drawDebugAtlas(SkCanvas*, const gfx::Point& destPosition) const;
 
 private:
-    FontAtlas(SkBitmap, IntRect asciiToRectTable[128], int fontHeight);
+    FontAtlas(SkBitmap, gfx::Rect asciiToRectTable[128], int fontHeight);
 
     void drawOneLineOfTextInternal(SkCanvas*, const SkPaint&, const std::string&, const gfx::Point& destPosition) const;
 
     // The actual texture atlas containing all the pre-rendered glyphs.
     SkBitmap m_atlas;
 
-    // The look-up tables mapping ascii characters to their IntRect locations on the atlas.
-    IntRect m_asciiToRectTable[128];
+    // The look-up tables mapping ascii characters to their gfx::Rect locations on the atlas.
+    gfx::Rect m_asciiToRectTable[128];
 
     int m_fontHeight;