ui/gfx: Convert Canvas::DrawRectInt() to use gfx::Rect.

ui/gfx/canvas_skia.cc

Index: ui/gfx/canvas_skia.cc
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index 4a7c7fc6b8f8bbd22a35ea96a21e360d388dc553..0b8a62bc846893fca1725d93bcb99c9a91e44041 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -133,7 +133,7 @@ void CanvasSkia::FillRect(const SkColor& color,
   paint.setColor(color);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setXfermodeMode(mode);
-  DrawRectInt(rect.x(), rect.y(), rect.width(), rect.height(), paint);
+  DrawRect(rect, paint);
 }
 
 void CanvasSkia::FillRect(const gfx::Brush* brush, const gfx::Rect& rect) {
@@ -141,16 +141,16 @@ void CanvasSkia::FillRect(const gfx::Brush* brush, const gfx::Rect& rect) {
   SkPaint paint;
   paint.setShader(shader->shader());
   // TODO(beng): set shader transform to match canvas transform.
-  DrawRectInt(rect.x(), rect.y(), rect.width(), rect.height(), paint);
+  DrawRect(rect, paint);
 }
 
-void CanvasSkia::DrawRectInt(const SkColor& color, int x, int y, int w, int h) {
-  DrawRectInt(color, x, y, w, h, SkXfermode::kSrcOver_Mode);
+void CanvasSkia::DrawRect(const SkColor& color, const gfx::Rect& rect) {
+  DrawRect(color, rect, SkXfermode::kSrcOver_Mode);
 }
 
-void CanvasSkia::DrawRectInt(const SkColor& color,
-                             int x, int y, int w, int h,
-                             SkXfermode::Mode mode) {
+void CanvasSkia::DrawRect(const SkColor& color,
+                          const gfx::Rect& rect,
+                          SkXfermode::Mode mode) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kStroke_Style);
@@ -160,11 +160,11 @@ void CanvasSkia::DrawRectInt(const SkColor& color,
   paint.setStrokeWidth(SkIntToScalar(0));
   paint.setXfermodeMode(mode);
 
-  DrawRectInt(x, y, w, h, paint);
+  DrawRect(rect, paint);
 }
 
-void CanvasSkia::DrawRectInt(int x, int y, int w, int h, const SkPaint& paint) {
-  SkIRect rc = { x, y, x + w, y + h };
+void CanvasSkia::DrawRect(const gfx::Rect& rect, const SkPaint& paint) {
+  SkIRect rc = { rect.x(), rect.y(), rect.right(), rect.bottom() };

[Peter Kasting, 2011/11/05 01:10:10]

Nit: Maybe we should just add a RectToSkIRect() function to skia_util.h?

[tfarina, 2011/11/05 02:23:24]

Done.

   canvas_->drawIRect(rc, paint);
 }
 
@@ -214,10 +214,12 @@ void CanvasSkia::DrawFocusRect(const gfx::Rect& rect) {
   paint.setShader(shader);
   shader->unref();
 
-  DrawRectInt(rect.x(), rect.y(), rect.width(), 1, paint);
-  DrawRectInt(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1, paint);
-  DrawRectInt(rect.x(), rect.y(), 1, rect.height(), paint);
-  DrawRectInt(rect.x() + rect.width() - 1, rect.y(), 1, rect.height(), paint);
+  DrawRect(gfx::Rect(rect.x(), rect.y(), rect.width(), 1), paint);
+  DrawRect(gfx::Rect(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1),
+           paint);
+  DrawRect(gfx::Rect(rect.x(), rect.y(), 1, rect.height()), paint);
+  DrawRect(gfx::Rect(rect.x() + rect.width() - 1, rect.y(), 1, rect.height()),
+           paint);
 }
 
 void CanvasSkia::DrawBitmapInt(const SkBitmap& bitmap, int x, int y) {