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

ui/views/controls/scrollbar/bitmap_scroll_bar.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 "ui/views/controls/scrollbar/bitmap_scroll_bar.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 105 matching lines @@
                          grippy_bitmap()->height());
   }
 
  protected:
   // View overrides:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     canvas->DrawBitmapInt(*start_cap_bitmap(), 0, 0);
     int top_cap_height = start_cap_bitmap()->height();
     int bottom_cap_height = end_cap_bitmap()->height();
     int thumb_body_height = height() - top_cap_height - bottom_cap_height;
-    canvas->TileImageInt(*background_bitmap(), 0, top_cap_height,
-                         background_bitmap()->width(), thumb_body_height);
+    canvas->TileImage(*background_bitmap(), gfx::Rect(0, top_cap_height,
+        background_bitmap()->width(), thumb_body_height));
     canvas->DrawBitmapInt(*end_cap_bitmap(), 0,
                           height() - bottom_cap_height);
 
     // Paint the grippy over the track.
     int grippy_x = (width() - grippy_bitmap()->width()) / 2;
     int grippy_y = (thumb_body_height - grippy_bitmap()->height()) / 2;
     canvas->DrawBitmapInt(*grippy_bitmap(), grippy_x, grippy_y);
   }
 
  private:
@@ skipping 147 matching lines @@
     thumb->SetVisible(true);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BitmapScrollBar, View implementation:
 
 void BitmapScrollBar::OnPaint(gfx::Canvas* canvas) {
   // Paint the track.
   gfx::Rect track_bounds = GetTrackBounds();
-  canvas->TileImageInt(*images_[THUMB_TRACK][GetThumbTrackState()],
-                       track_bounds.x(), track_bounds.y(),
-                       track_bounds.width(), track_bounds.height());
+  canvas->TileImage(*images_[THUMB_TRACK][GetThumbTrackState()],
+                    gfx::Rect(track_bounds.x(), track_bounds.y(),

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

Nit: Just pass GetTrackBounds() directly and drop the temp and the rect
construction.

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

Done.

+                              track_bounds.width(), track_bounds.height()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BitmapScrollBar, ButtonListener implementation:
 
 void BitmapScrollBar::ButtonPressed(Button* sender, const views::Event& event) {
   if (sender == prev_button_) {
     ScrollByAmount(SCROLL_PREV_LINE);
   } else if (sender == next_button_) {
     ScrollByAmount(SCROLL_NEXT_LINE);
   }
 }
 
 }  // namespace views