ui/gfx: Make the first version of Canvas::TileImageInt take a gfx::Rect.

chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc

 // Copyright (c) 2012 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/frame/app_panel_browser_frame_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 338 matching lines @@
     int center_width = width() - left_edge->width() - right_edge->width();
     if (center_width > 0) {
       // Now fill the bottom area.
       canvas->FillRect(gfx::Rect(left_edge->width(),
                                  height() - bottom_edge->height(), center_width,
                                  bottom_edge->height()), frame_color);
     }
   }
 
   // Draw the theme frame.
-  canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
+  canvas->TileImage(*theme_frame,
+                    gfx::Rect(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->TileImage(*top_edge, gfx::Rect(top_left_corner->width(), 0,
+      width() - top_right_corner->width(), top_edge->height()));

[Peter Kasting, 2012/02/06 22:32:39]

Nit: While here, this has a bug; third arg should be "width() -
top_left_corner_width() - top_right_corner->width()"

[tfarina, 2012/02/06 23:12:16]

Done.

   canvas->DrawBitmapInt(*top_right_corner,
                         width() - top_right_corner->width(), 0);
 
   // Right.
-  canvas->TileImageInt(*right_edge, width() - right_edge->width(),
+  canvas->TileImage(*right_edge, gfx::Rect(width() - right_edge->width(),
       top_right_corner->height(), right_edge->width(),
-      height() - top_right_corner->height() - bottom_right_corner->height());
+      height() - top_right_corner->height() - bottom_right_corner->height()));
 
   // Bottom.
   canvas->DrawBitmapInt(*bottom_right_corner,
                         width() - bottom_right_corner->width(),
                         height() - bottom_right_corner->height());
-  canvas->TileImageInt(*bottom_edge, bottom_left_corner->width(),
+  canvas->TileImage(*bottom_edge, gfx::Rect(bottom_left_corner->width(),
       height() - bottom_edge->height(),
       width() - bottom_left_corner->width() - bottom_right_corner->width(),
-      bottom_edge->height());
+      bottom_edge->height()));
   canvas->DrawBitmapInt(*bottom_left_corner, 0,
                         height() - bottom_left_corner->height());
 
   // Left.
-  canvas->TileImageInt(*left_edge, 0, top_left_corner->height(),
+  canvas->TileImage(*left_edge, gfx::Rect(0, top_left_corner->height(),
       left_edge->width(),
-      height() - top_left_corner->height() - bottom_left_corner->height());
+      height() - top_left_corner->height() - bottom_left_corner->height()));
 }
 
 void AppPanelBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

[Peter Kasting, 2012/02/06 22:32:39]

Nit: Same nit about qualifiers

 
   SkBitmap* frame_image = rb.GetBitmapNamed(IDR_FRAME_APP_PANEL);
-  canvas->TileImageInt(*frame_image, 0, FrameBorderThickness(), width(),
-                       frame_image->height());
+  canvas->TileImage(*frame_image, gfx::Rect(0, FrameBorderThickness(), width(),
+      frame_image->height()));
 
   // The bottom of the titlebar actually comes from the top of the Client Edge
   // graphic, with the actual client edge clipped off the bottom.
   SkBitmap* titlebar_bottom = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
   int edge_height = titlebar_bottom->height() - kClientEdgeThickness;
-  canvas->TileImageInt(*titlebar_bottom, 0,
-                       frame()->client_view()->y() - edge_height,
-                       width(), edge_height);
+  canvas->TileImage(*titlebar_bottom, gfx::Rect(0,
+      frame()->client_view()->y() - edge_height, width(), edge_height));
 }
 
 void AppPanelBrowserFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   // The window icon is painted by the TabIconView.
   views::WidgetDelegate* d = frame()->widget_delegate();
   canvas->DrawStringInt(d->GetWindowTitle(), BrowserFrame::GetTitleFont(),
       SK_ColorBLACK, GetMirroredXForRect(title_bounds_), title_bounds_.y(),
       title_bounds_.width(), title_bounds_.height());
 }
 
@@ skipping 10 matching lines @@
       rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER);
   SkBitmap* bottom = rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_CENTER);
   SkBitmap* bottom_left =
       rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER);
   SkBitmap* left = rb.GetBitmapNamed(IDR_CONTENT_LEFT_SIDE);
 
   // Top.
   int top_edge_y = client_area_top - top->height();
   canvas->DrawBitmapInt(*top_left, client_area_bounds.x() - top_left->width(),
                         top_edge_y);
-  canvas->TileImageInt(*top, client_area_bounds.x(), top_edge_y,
-                       client_area_bounds.width(), top->height());
+  canvas->TileImage(*top, gfx::Rect(client_area_bounds.x(), top_edge_y,
+      client_area_bounds.width(), top->height()));
   canvas->DrawBitmapInt(*top_right, client_area_bounds.right(), top_edge_y);
 
   // Right.
   int client_area_bottom =
       std::max(client_area_top, client_area_bounds.bottom());
   int client_area_height = client_area_bottom - client_area_top;
-  canvas->TileImageInt(*right, client_area_bounds.right(), client_area_top,
-                       right->width(), client_area_height);
+  canvas->TileImage(*right, gfx::Rect(client_area_bounds.right(),
+      client_area_top, right->width(), client_area_height));
 
   // Bottom.
   canvas->DrawBitmapInt(*bottom_right, client_area_bounds.right(),
                         client_area_bottom);
-  canvas->TileImageInt(*bottom, client_area_bounds.x(), client_area_bottom,
-                       client_area_bounds.width(), bottom_right->height());
+  canvas->TileImage(*bottom, gfx::Rect(client_area_bounds.x(),
+      client_area_bottom, client_area_bounds.width(), bottom_right->height()));
   canvas->DrawBitmapInt(*bottom_left,
       client_area_bounds.x() - bottom_left->width(), client_area_bottom);
 
   // Left.
-  canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
-      client_area_top, left->width(), client_area_height);
+  canvas->TileImage(*left, gfx::Rect(client_area_bounds.x() - left->width(),
+      client_area_top, left->width(), client_area_height));
 
   // Draw the toolbar color to fill in the edges.
   canvas->DrawRect(gfx::Rect(
       client_area_bounds.x() - kClientEdgeThickness,
       client_area_top - kClientEdgeThickness,
       client_area_bounds.width() + kClientEdgeThickness,
       client_area_bottom - client_area_top + kClientEdgeThickness),
       ResourceBundle::toolbar_color);
 }
 
@@ skipping 36 matching lines @@
 }
 
 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width,
     int height) const {
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }