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

chrome/browser/ui/views/tabs/dragged_tab_view.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 "chrome/browser/ui/views/tabs/dragged_tab_view.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 123 matching lines @@
 // DraggedTabView, private:
 
 void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {
   gfx::Size ps = GetPreferredSize();
   gfx::CanvasSkia scale_canvas(ps.width(), ps.height(), false);
   SkBitmap& bitmap_device = const_cast<SkBitmap&>(
       skia::GetTopDevice(*scale_canvas.sk_canvas())->accessBitmap(true));
   bitmap_device.eraseARGB(0, 0, 0, 0);
 
   int tab_height = renderer_bounds_.back().height();
-  scale_canvas.FillRectInt(kDraggedTabBorderColor, 0,
-      tab_height - kDragFrameBorderSize,
-      ps.width(), ps.height() - tab_height);
-  int image_x = kDragFrameBorderSize;
-  int image_y = tab_height;
-  int image_w = ps.width() - kTwiceDragFrameBorderSize;
-  int image_h = contents_size_.height();
-  scale_canvas.FillRectInt(SK_ColorBLACK, image_x, image_y, image_w, image_h);
-  photobooth_->PaintScreenshotIntoCanvas(
-      &scale_canvas,
-      gfx::Rect(image_x, image_y, image_w, image_h));
+  scale_canvas.FillRect(kDraggedTabBorderColor,
+                        gfx::Rect(0, tab_height - kDragFrameBorderSize,
+                                  ps.width(), ps.height() - tab_height));
+  gfx::Rect image_rect(kDragFrameBorderSize,
+                       tab_height,
+                       ps.width() - kTwiceDragFrameBorderSize,
+                       contents_size_.height());
+  scale_canvas.FillRect(SK_ColorBLACK, image_rect);
+  photobooth_->PaintScreenshotIntoCanvas(&scale_canvas, image_rect);
   for (size_t i = 0; i < renderers_.size(); ++i)
     renderers_[i]->Paint(&scale_canvas);
 
   SkIRect subset;
   subset.set(0, 0, ps.width(), ps.height());
   SkBitmap mipmap = scale_canvas.ExtractBitmap();
   mipmap.buildMipMap(true);
 
   SkShader* bitmap_shader =
       SkShader::CreateBitmapShader(mipmap, SkShader::kClamp_TileMode,
@@ skipping 25 matching lines @@
 }
 
 gfx::Size DraggedTabView::PreferredContainerSize() {
   gfx::Size ps = GetPreferredSize();
   return gfx::Size(ScaleValue(ps.width()), ScaleValue(ps.height()));
 }
 
 int DraggedTabView::ScaleValue(int value) {
   return static_cast<int>(value * kScalingFactor);
 }