roll skia 1402:1410

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 0cb4a0f0cce99c6e7d6a2fb608ee23e3e58016d9..b68da81218138e3a7386412140e4a05592c46160 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -147,8 +147,8 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
   if (badge_width >= kCenterAlignThreshold) {
     rect.fLeft = SkIntToScalar(
                      SkScalarFloor(SkIntToScalar(bounds.x()) +
-                                   SkIntToScalar(bounds.width() / 2.0) -
-                                   SkIntToScalar(badge_width / 2.0)));
+                                   SkIntToScalar(bounds.width() / 2) -
+                                   SkIntToScalar(badge_width / 2)));

[reed1, 2011/05/24 21:09:45]

I think we're losing the fraction part with this change. Done we want

SkIntToScalar(bounds.width()) / 2

(same for badge_width)

[epoger, 2011/05/24 21:16:21]

I agree with Mike... either that, or...
SkDoubleToScalar(bounds.width() / 2.0)

[Nico, 2011/05/24 21:17:35]

Will do.

     rect.fRight = rect.fLeft + SkIntToScalar(badge_width);
   } else {
     rect.fRight = SkIntToScalar(bounds.right());