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

chrome/browser/ui/views/constrained_window_views.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/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 432 matching lines @@
   SkBitmap* bottom_right_corner =
       resources_->GetPartBitmap(FRAME_BOTTOM_RIGHT_CORNER);
   SkBitmap* bottom_edge = resources_->GetPartBitmap(FRAME_BOTTOM_EDGE);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SkBitmap* theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME);
   SkColor frame_color = ResourceBundle::frame_color;
 
   // Fill with the frame color first so we have a constant background for
   // areas not covered by the theme image.
-  canvas->FillRectInt(frame_color, 0, 0, width(), theme_frame->height());
-  // Now fill down the sides.
-  canvas->FillRectInt(frame_color, 0, theme_frame->height(), left_edge->width(),
-                      height() - theme_frame->height());
-  canvas->FillRectInt(frame_color, width() - right_edge->width(),
-                      theme_frame->height(), right_edge->width(),
-                      height() - theme_frame->height());
-  // Now fill the bottom area.
-  canvas->FillRectInt(frame_color,
-      left_edge->width(), height() - bottom_edge->height(),
-      width() - left_edge->width() - right_edge->width(),
-      bottom_edge->height());
+  canvas->FillRect(frame_color,
+                   gfx::Rect(0, 0, width(), theme_frame->height()));
+
+  int remaining_height = height() - theme_frame->height();
+  if (remaining_height > 0) {
+    // Now fill down the sides.
+    canvas->FillRect(frame_color, gfx::Rect(0, theme_frame->height(),
+                                            left_edge->width(),
+                                            remaining_height));
+    canvas->FillRect(frame_color, gfx::Rect(width() - right_edge->width(),
+                                            theme_frame->height(),
+                                            right_edge->width(),
+                                            remaining_height));
+    int center_width = width() - left_edge->width() - right_edge->width();
+    if (center_width > 0) {
+      // Now fill the bottom area.
+      canvas->FillRect(frame_color,
+                       gfx::Rect(left_edge->width(),
+                                 height() - bottom_edge->height(),
+                                 center_width, bottom_edge->height()));
+    }
+  }
 
   // Draw the theme frame.
   canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
 
   // Top.
   canvas->DrawBitmapInt(*top_left_corner, 0, 0);
   canvas->TileImageInt(*top_edge, top_left_corner->width(), 0,
                        width() - top_right_corner->width(), top_edge->height());
   canvas->DrawBitmapInt(*top_right_corner,
                         width() - top_right_corner->width(), 0);
@@ skipping 26 matching lines @@
       *title_font_, GetTitleColor(), GetMirroredXForRect(title_bounds_),
       title_bounds_.y(), title_bounds_.width(), title_bounds_.height());
 }
 
 void ConstrainedWindowFrameView::PaintClientEdge(gfx::Canvas* canvas) {
   gfx::Rect client_edge_bounds(CalculateClientAreaBounds(width(), height()));
   client_edge_bounds.Inset(-kClientEdgeThickness, -kClientEdgeThickness);
   gfx::Rect frame_shadow_bounds(client_edge_bounds);
   frame_shadow_bounds.Inset(-kFrameShadowThickness, -kFrameShadowThickness);
 
-  canvas->FillRectInt(kContentsBorderShadow, frame_shadow_bounds.x(),
-                      frame_shadow_bounds.y(), frame_shadow_bounds.width(),
-                      frame_shadow_bounds.height());
-
-  canvas->FillRectInt(ResourceBundle::toolbar_color, client_edge_bounds.x(),
-                      client_edge_bounds.y(), client_edge_bounds.width(),
-                      client_edge_bounds.height());
+  canvas->FillRect(kContentsBorderShadow, frame_shadow_bounds);
+  canvas->FillRect(ResourceBundle::toolbar_color, client_edge_bounds);
 }
 
 void ConstrainedWindowFrameView::LayoutWindowControls() {
   gfx::Size close_button_size = close_button_->GetPreferredSize();
   close_button_->SetBounds(
       width() - kFrameBorderThickness - close_button_size.width(),
       kFrameShadowThickness, close_button_size.width(),
       close_button_size.height());
 }
 
@@ skipping 129 matching lines @@
 }
 
 void ConstrainedWindowViews::OnNativeConstrainedWindowMouseActivate() {
   Activate();
 }
 
 views::internal::NativeWidgetDelegate*
     ConstrainedWindowViews::AsNativeWidgetDelegate() {
   return this;
 }