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

chrome/browser/ui/views/tabs/tab.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/tabs/tab.h"
 
 #include <limits>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 467 matching lines @@
 
   canvas->DrawBitmapInt(background_canvas.ExtractBitmap(), 0, 0);
 
   if (!GetThemeProvider()->HasCustomImage(tab_id) &&
       hover_controller().ShouldDraw()) {
     hover_controller().Draw(canvas, background_canvas.ExtractBitmap());
   }
 
   // Now draw the highlights/shadows around the tab edge.
   canvas->DrawBitmapInt(*tab_inactive_image->image_l, 0, 0);
-  canvas->TileImageInt(*tab_inactive_image->image_c,
-                       tab_inactive_image->l_width, 0,
-                       width() - tab_inactive_image->l_width -
-                           tab_inactive_image->r_width,
-                       height());
-  canvas->DrawBitmapInt(*tab_inactive_image->image_r,
-                        width() - tab_inactive_image->r_width, 0);
+  gfx::Rect tile_rect(GetLocalBounds());
+  tile_rect.Inset(tab_inactive_image->l_width, 0,
+                  tab_inactive_image->r_width, 0);
+  canvas->TileImage(*tab_inactive_image->image_c, tile_rect);
+  canvas->DrawBitmapInt(*tab_inactive_image->image_r, tile_rect.right(), 0);
 }
 
 void Tab::PaintActiveTabBackground(gfx::Canvas* canvas) {
   int offset = GetMirroredX() + background_offset_.x();
   ui::ThemeProvider* tp = GetThemeProvider();
   DCHECK(tp) << "Unable to get theme provider";
 
   SkBitmap* tab_bg = GetThemeProvider()->GetBitmapNamed(IDR_THEME_TOOLBAR);
 
   TabImage* tab_image = &tab_active_;
@@ skipping 18 matching lines @@
   canvas->TileImageInt(*tab_bg,
      offset + tab_image->l_width,
      kDropShadowHeight + tab_image->y_offset,
      tab_image->l_width,
      kDropShadowHeight + tab_image->y_offset,
      width() - tab_image->l_width - tab_image->r_width,
      height() - kDropShadowHeight - tab_image->y_offset);
 
   // Now draw the highlights/shadows around the tab edge.
   canvas->DrawBitmapInt(*tab_image->image_l, 0, 0);
-  canvas->TileImageInt(*tab_image->image_c, tab_image->l_width, 0,
-      width() - tab_image->l_width - tab_image->r_width, height());
+  canvas->TileImage(*tab_image->image_c, gfx::Rect(tab_image->l_width, 0,
+      width() - tab_image->l_width - tab_image->r_width, height()));
   canvas->DrawBitmapInt(*tab_image->image_r, width() - tab_image->r_width, 0);
 }
 
 int Tab::IconCapacity() const {
   if (height() < GetMinimumUnselectedSize().height())
     return 0;
   return (width() - kLeftPadding - kRightPadding) / kTabIconSize;
 }
 
 bool Tab::ShouldShowIcon() const {
@@ skipping 58 matching lines @@
   tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active_.l_width = tab_active_.image_l->width();
   tab_active_.r_width = tab_active_.image_r->width();
 
   tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }