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

chrome/common/extensions/extension_action.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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/common/badge_util.h"
 #include "googleurl/src/gurl.h"
@@ skipping 127 matching lines @@
     badge_width += 1;
   badge_width = std::max(kBadgeHeight, badge_width);
 
   // Paint the badge background color in the right location. It is usually
   // right-aligned, but it can also be center-aligned if it is large.
   SkRect rect;
   rect.fBottom = SkIntToScalar(bounds.bottom() - kBottomMargin);
   rect.fTop = rect.fBottom - SkIntToScalar(kBadgeHeight);
   if (badge_width >= kCenterAlignThreshold) {
     rect.fLeft = SkIntToScalar(
                      SkScalarFloor(SkIntToScalar(bounds.x()) +

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

Nit: While here, convert SkIntToScalar(SkScalarFloor(...)) to
SkScalarFloorToScalar(...)

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

Could you take another look, to see if I get this right?

                                    SkIntToScalar(bounds.width()) / 2 -
                                    SkIntToScalar(badge_width) / 2));
     rect.fRight = rect.fLeft + SkIntToScalar(badge_width);
   } else {
     rect.fRight = SkIntToScalar(bounds.right());
     rect.fLeft = rect.fRight - badge_width;
   }
 
   SkPaint rect_paint;
   rect_paint.setStyle(SkPaint::kFill_Style);
   rect_paint.setAntiAlias(true);
   rect_paint.setColor(background_color);
   canvas->GetSkCanvas()->drawRoundRect(rect, SkIntToScalar(2),
                                        SkIntToScalar(2), rect_paint);
 
   // Overlay the gradient. It is stretchy, so we do this in three parts.
   ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
   SkBitmap* gradient_left = resource_bundle.GetBitmapNamed(
       IDR_BROWSER_ACTION_BADGE_LEFT);
   SkBitmap* gradient_right = resource_bundle.GetBitmapNamed(
       IDR_BROWSER_ACTION_BADGE_RIGHT);
   SkBitmap* gradient_center = resource_bundle.GetBitmapNamed(
       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()));
+  canvas->TileImage(*gradient_center,

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

Nit: Simpler:

  gfx::Rect tile_rect(gfx::SkRectToRect(rect));
  tile_rect.Inset(gradient_left->width(), 0, gradient_right->width(), 0);
  canvas->TileImage(*gradient_center, tile_rect);

+      gfx::Rect(SkScalarFloor(rect.fLeft) + gradient_left->width(),
+                SkScalarFloor(rect.fTop),
+                SkScalarFloor(rect.width()) - gradient_left->width() -
+                              gradient_right->width(),
+                SkScalarFloor(rect.height())));
   canvas->GetSkCanvas()->drawBitmap(*gradient_right,
       rect.fRight - SkIntToScalar(gradient_right->width()), rect.fTop);
 
   // Finally, draw the text centered within the badge. We set a clip in case the
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->GetSkCanvas()->clipRect(rect);
   canvas->GetSkCanvas()->drawText(text.c_str(), text.size(),
                                   rect.fLeft + (rect.width() - text_width) / 2,
                                   rect.fTop + kTextSize + kTopTextPadding,
                                   *text_paint);
   canvas->Restore();
 }