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

ui/gfx/canvas_skia.cc

 // Copyright (c) 2011 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.
 
 #include "ui/gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 91 matching lines @@
              SkIntToScalar(layer_bounds.y()),
              SkIntToScalar(layer_bounds.right()),
              SkIntToScalar(layer_bounds.bottom()));
   canvas_->saveLayerAlpha(&bounds, alpha);
 }
 
 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);
 }
 
 void CanvasSkia::TranslateInt(int x, int y) {
   canvas_->translate(SkIntToScalar(x), SkIntToScalar(y));
 }
 
 void CanvasSkia::ScaleInt(int x, int y) {
   canvas_->scale(SkIntToScalar(x), SkIntToScalar(y));
 }
@@ skipping 203 matching lines @@
                                                   SkShader::kRepeat_TileMode);
   paint.setShader(shader);
   paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
 
   // CreateBitmapShader returns a Shader with a reference count of one, we
   // need to unref after paint takes ownership of the shader.
   shader->unref();
   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();
 }
 
 gfx::NativeDrawingContext CanvasSkia::BeginPlatformPaint() {
   return skia::BeginPlatformPaint(canvas_);
 }
 
 void CanvasSkia::EndPlatformPaint() {
   skia::EndPlatformPaint(canvas_);
@@ skipping 65 matching lines @@
 
 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx