ui/gfx: Convert Canvas::ClipRectInt() 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 4e481ef43be1ba4b992551d97c2dc93861b7e013..1ef7f3494f7c6f4e270ce0e73578e9e64d62d9d6 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -109,10 +109,12 @@ void CanvasSkia::Restore() {
   canvas_->restore();
 }
 
-bool CanvasSkia::ClipRectInt(int x, int y, int w, int h) {
+bool CanvasSkia::ClipRectInt(const gfx::Rect& rect) {
   SkRect new_clip;

[Peter Kasting, 2011/10/25 20:24:47]

Nit: Simpler:

return canvas_->clipRect(gfx::RectToSkRect(rect));

You may need to #include "ui/gfx/skia_util.h".

[tfarina, 2011/10/25 23:52:41]

Done.

-  new_clip.set(SkIntToScalar(x), SkIntToScalar(y),
-               SkIntToScalar(x + w), SkIntToScalar(y + h));
+  new_clip.set(SkIntToScalar(rect.x()),
+               SkIntToScalar(rect.y()),
+               SkIntToScalar(rect.x() + rect.width()),
+               SkIntToScalar(rect.y() + rect.height()));
   return canvas_->clipRect(new_clip);
 }
 
@@ -336,7 +338,7 @@ void CanvasSkia::TileImageInt(const SkBitmap& bitmap,
   canvas_->save();
   canvas_->translate(SkIntToScalar(dest_x - src_x),
                      SkIntToScalar(dest_y - src_y));
-  ClipRectInt(src_x, src_y, w, h);
+  ClipRectInt(gfx::Rect(src_x, src_y, w, h));
   canvas_->drawPaint(paint);
   canvas_->restore();
 }