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

ui/gfx/canvas_direct2d.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_direct2d.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/brush.h"
 #include "ui/gfx/rect.h"
 
@@ skipping 184 matching lines @@
 void CanvasDirect2D::Scale(int x_scale, int y_scale) {
   D2D1_MATRIX_3X2_F raw;
   rt_->GetTransform(&raw);
   D2D1::Matrix3x2F transform(raw._11, raw._12, raw._21, raw._22, raw._31,
                              raw._32);
   transform = D2D1::Matrix3x2F::Scale(static_cast<float>(x_scale),
                                       static_cast<float>(y_scale)) * transform;
   rt_->SetTransform(transform);
 }
 
-void CanvasDirect2D::FillRectInt(const SkColor& color,
-                                 int x, int y, int w, int h) {
+void CanvasDirect2D::FillRect(const SkColor& color, const gfx::Rect& rect) {
   base::win::ScopedComPtr<ID2D1SolidColorBrush> solid_brush;
   rt_->CreateSolidColorBrush(SkColorToColorF(color), solid_brush.Receive());
-  rt_->FillRectangle(RectToRectF(x, y, w, h), solid_brush);
+  rt_->FillRectangle(RectToRectF(rect), solid_brush);
 }
 
-void CanvasDirect2D::FillRectInt(const SkColor& color,
-                                 int x, int y, int w, int h,
-                                 SkXfermode::Mode mode) {
+void CanvasDirect2D::FillRect(const SkColor& color,
+                              const gfx::Rect& rect,
+                              SkXfermode::Mode mode) {
   NOTIMPLEMENTED();
 }
 
-void CanvasDirect2D::FillRectInt(const gfx::Brush* brush,
-                                 int x, int y, int w, int h) {
+void CanvasDirect2D::FillRect(const gfx::Brush* brush, const gfx::Rect& rect) {
   const Direct2DBrush* d2d_brush = static_cast<const Direct2DBrush*>(brush);
-  rt_->FillRectangle(RectToRectF(x, y, w, h), d2d_brush->brush());
+  rt_->FillRectangle(RectToRectF(rect), d2d_brush->brush());
 }
 
 void CanvasDirect2D::DrawRectInt(const SkColor& color,
                                  int x, int y, int w, int h) {
   base::win::ScopedComPtr<ID2D1SolidColorBrush> solid_brush;
   rt_->CreateSolidColorBrush(SkColorToColorF(color), solid_brush.Receive());
   rt_->DrawRectangle(RectToRectF(x, y, w, h), solid_brush);
 }
 
 void CanvasDirect2D::DrawRectInt(const SkColor& color,
@@ skipping 130 matching lines @@
 // CanvasDirect2D, private:
 
 void CanvasDirect2D::SaveInternal(ID2D1Layer* layer) {
   if (!drawing_state_block_)
     GetD2D1Factory()->CreateDrawingStateBlock(drawing_state_block_.Receive());
   rt_->SaveDrawingState(drawing_state_block_.get());
   state_.push(RenderState(layer));
 }
 
 }  // namespace gfx