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

ui/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 "ui/views/window/custom_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 353 matching lines @@
   frame_background_->set_top_area_height(frame_image->height());
 
   frame_background_->PaintMaximized(canvas, this);
 
   // TODO(jamescook): Migrate this into FrameBackground.
   // 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() -
                     (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
-  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 CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   WidgetDelegate* d = frame_->widget_delegate();
 
   // It seems like in some conditions we can be asked to paint after the window
   // that contains us is WM_DESTROYed. At this point, our delegate is NULL. The
   // correct long term fix may be to shut down the RootView in WM_DESTROY.
   if (!d)
     return;
@@ skipping 17 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() - 1, client_area_top - 1,
       client_area_bounds.width() + 1, client_area_bottom - client_area_top + 1),
       ui::ResourceBundle::toolbar_color);
 }
 
 SkColor CustomFrameView::GetFrameColor() const {
   return frame_->IsActive() ? kDefaultColorFrame : kDefaultColorFrameInactive;
 }
@@ skipping 110 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