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

chrome/common/extensions/extension_action.cc

Index: chrome/common/extensions/extension_action.cc
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 284da0e594a65c49f44d8e6bc141c0e2d40b816f..3eba566968106429857318fef7697c8c9c2be10a 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -145,10 +145,9 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
   rect.fBottom = SkIntToScalar(bounds.bottom() - kBottomMargin);
   rect.fTop = rect.fBottom - SkIntToScalar(kBadgeHeight);
   if (badge_width >= kCenterAlignThreshold) {
-    rect.fLeft = SkIntToScalar(
-                     SkScalarFloor(SkIntToScalar(bounds.x()) +
-                                   SkIntToScalar(bounds.width()) / 2 -
-                                   SkIntToScalar(badge_width) / 2));
+    rect.fLeft = SkScalarFloorToScalar(SkIntToScalar(bounds.x()) +

[Peter Kasting, 2012/02/06 23:21:51]

Looks right to me

+                                       SkIntToScalar(bounds.width()) / 2 -
+                                       SkIntToScalar(badge_width) / 2);
     rect.fRight = rect.fLeft + SkIntToScalar(badge_width);
   } else {
     rect.fRight = SkIntToScalar(bounds.right());
@@ -172,12 +171,9 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
       IDR_BROWSER_ACTION_BADGE_CENTER);
 
   canvas->GetSkCanvas()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop);
-  canvas->TileImageInt(*gradient_center,
-      SkScalarFloor(rect.fLeft) + gradient_left->width(),
-      SkScalarFloor(rect.fTop),
-      SkScalarFloor(rect.width()) - gradient_left->width() -
-                    gradient_right->width(),
-      SkScalarFloor(rect.height()));
+  gfx::Rect tile_rect(gfx::SkRectToRect(rect));
+  tile_rect.Inset(gradient_left->width(), 0, gradient_right->width(), 0);
+  canvas->TileImage(*gradient_center, tile_rect);
   canvas->GetSkCanvas()->drawBitmap(*gradient_right,
       rect.fRight - SkIntToScalar(gradient_right->width()), rect.fTop);