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

views/window/custom_frame_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 "views/window/custom_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 327 matching lines @@
   SkBitmap* right_edge = rb.GetBitmapNamed(IDR_WINDOW_RIGHT_SIDE);
   SkBitmap* left_edge = rb.GetBitmapNamed(IDR_WINDOW_LEFT_SIDE);
   SkBitmap* bottom_left_corner =
       rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER);
   SkBitmap* bottom_right_corner =
       rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER);
   SkBitmap* bottom_edge = rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_CENTER);
 
   // 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(), frame_image->height());
+  canvas->FillRect(frame_color,
+                   gfx::Rect(0, 0, width(), frame_image->height()));

[tfarina, 2011/10/27 15:13:20]

Peter, using gfx::Rect here is causing views_unittests to assert on a negative
height (-99) because of the check in Size::set_height(). So the unittests are
not passing.

[Peter Kasting, 2011/10/27 19:17:29]

How is it that we're somehow getting a frame_image with height -99 in unit
tests?  We should fix that.

[tfarina, 2011/10/27 20:46:03]

Yeah, I was going to send you the try bot urls with the failing tests but they
seem to have expired. Plus some interactive_ui_tests are also failing for the
same reason.

[Peter Kasting, 2011/10/27 20:50:34]

Can you figure out how to fix this?

   // Now fill down the sides.
-  canvas->FillRectInt(frame_color, 0, frame_image->height(), left_edge->width(),
-                      height() - frame_image->height());
-  canvas->FillRectInt(frame_color, width() - right_edge->width(),
-                      frame_image->height(), right_edge->width(),
-                      height() - frame_image->height());
+  canvas->FillRect(frame_color,
+                   gfx::Rect(0, frame_image->height(),
+                             left_edge->width(),
+                             height() - frame_image->height()));

[tfarina, 2011/10/27 21:31:30]

Hard to say. But probably I can help identify the cause.
 
gdb says that this->height() is 29 and frame_image->height() is 128. That ends
up in -99. So for some reason we have this tiny height().

[Peter Kasting, 2011/10/27 21:49:18]

Oh!  I misinterpreted what you were saying was negative.

This one is easy:

  int remaining_height = height() - frame_image->height();
  if (remaining_height > 0) {
    // Now fill down the sides.
    canvas->FillRect(frame_color, gfx::Rect(0, frame_image->height(),
        left_edge->width(), remaining_height));
    canvas->FillRect(frame_color, gfx::Rect(width() - right_edge->width(),
        frame_image->height(), right_edge->width(), remaining_height));
    // Now fill the bottom area.
    int center_width = width() - left_edge->width() - right_edge->width();
    if (center_width > 0) {
      canvas->FillRect(frame_color, gfx::Rect(left_edge->width(),
          height() - bottom_edge->height(), center_width,
          bottom_edge->height()));
    }
  }

We should probably also do similar checks in other files with this pattern.

+  canvas->FillRect(frame_color,
+                   gfx::Rect(width() - right_edge->width(),
+                             frame_image->height(),
+                             right_edge->width(),
+                             height() - frame_image->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(left_edge->width(),
+                height() - bottom_edge->height(),
+                width() - left_edge->width() - right_edge->width(),
+                bottom_edge->height()));
 
   // Draw the theme frame.
   canvas->TileImageInt(*frame_image, 0, 0, width(), frame_image->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 208 matching lines @@
     title_font_ = new gfx::Font(NativeWidgetWin::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO(ben): need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views