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

chrome/browser/ui/panels/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/panels/panel_browser_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 768 matching lines @@
                                GetCloseButtonResources().mask_image);
 }
 
 void PanelBrowserFrameView::PaintFrameBorder(gfx::Canvas* canvas) {
   // Paint the background.
   if (paint_state_ == PAINT_FOR_ATTENTION || UsingDefaultTheme()) {
     const SkPaint& paint = GetDefaultFrameTheme(paint_state_);
     canvas->DrawRect(gfx::Rect(0, 0, width(), kTitlebarHeight), paint);
   } else {
     SkBitmap* bitmap = GetFrameTheme(paint_state_);
-    canvas->TileImageInt(*bitmap, 0, 0, width(), kTitlebarHeight);
+    canvas->TileImage(*bitmap, gfx::Rect(0, 0, width(), kTitlebarHeight));
   }
 
 #if defined(USE_AURA)
   // Aura recognizes aura::client::WINDOW_TYPE_PANEL and will draw the
   // appropriate frame and shadow. See ash/wm/shadow_controller.h.
 
   // Draw the divider between the titlebar and the client area.
   if (height() > kTitlebarHeight) {
     canvas->DrawRect(gfx::Rect(0, kTitlebarHeight, width() - 1, 1),
                      kDividerColor);
   }
 #else
   // Draw the top border.
   const EdgeResources& frame_edges = GetFrameEdges();
   canvas->DrawBitmapInt(*(frame_edges.top_left), 0, 0);
-  canvas->TileImageInt(
-      *(frame_edges.top), frame_edges.top_left->width(), 0,
-      width() - frame_edges.top_right->width(), frame_edges.top->height());
+  canvas->TileImage(*(frame_edges.top), gfx::Rect(frame_edges.top_left->width(),
+      0, width() - frame_edges.top_right->width(), frame_edges.top->height()));

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

Nit: While here, this has a bug; third arg should be "width() -
frame_edges.top_left->width() - frame_edges.top_right->width()"

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

Done.

   canvas->DrawBitmapInt(
       *(frame_edges.top_right),
       width() - frame_edges.top_right->width(), 0);
 
   // Draw the right border.
-  canvas->TileImageInt(
-      *(frame_edges.right), width() - frame_edges.right->width(),
-      frame_edges.top_right->height(), frame_edges.right->width(),
-      height() - frame_edges.top_right->height() -
-          frame_edges.bottom_right->height());
+  canvas->TileImage(*(frame_edges.right),
+      gfx::Rect(width() - frame_edges.right->width(),
+                frame_edges.top_right->height(), frame_edges.right->width(),
+                height() - frame_edges.top_right->height() -
+                    frame_edges.bottom_right->height()));
 
   // Draw the bottom border.
   canvas->DrawBitmapInt(
       *(frame_edges.bottom_right),
       width() - frame_edges.bottom_right->width(),
       height() - frame_edges.bottom_right->height());
-  canvas->TileImageInt(
-      *(frame_edges.bottom), frame_edges.bottom_left->width(),
-      height() - frame_edges.bottom->height(),
-      width() - frame_edges.bottom_left->width() -
-          frame_edges.bottom_right->width(),
-      frame_edges.bottom->height());
+  canvas->TileImage(*(frame_edges.bottom),
+      gfx::Rect(frame_edges.bottom_left->width(),
+                height() - frame_edges.bottom->height(),
+                width() - frame_edges.bottom_left->width() -
+                    frame_edges.bottom_right->width(),
+                frame_edges.bottom->height()));
   canvas->DrawBitmapInt(
       *(frame_edges.bottom_left), 0,
       height() - frame_edges.bottom_left->height());
 
   // Draw the left border.
-  canvas->TileImageInt(
-      *(frame_edges.left), 0, frame_edges.top_left->height(),
+  canvas->TileImage(*(frame_edges.left), gfx::Rect(0,
+      frame_edges.top_left->height(),
       frame_edges.left->width(),
       height() - frame_edges.top_left->height() -
-          frame_edges.bottom_left->height());
+          frame_edges.bottom_left->height()));
 
   // Draw the divider between the titlebar and the client area.
   if (height() > kTitlebarHeight) {
     canvas->DrawRect(gfx::Rect(kBorderThickness, kTitlebarHeight,
                                width() - 1 - 2 * kBorderThickness,
                                kBorderThickness), kDividerColor);
   }
 #endif  // !defined(USE_AURA)
 }
 
@@ skipping 65 matching lines @@
 
   settings_menu_model_.reset(
       new PanelSettingsMenuModel(panel_browser_view_->panel()));
   settings_menu_adapter_.reset(
       new views::MenuModelAdapter(settings_menu_model_.get()));
   settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
   settings_menu_adapter_->BuildMenu(settings_menu_);
   settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
   return true;
 }