Centering the browser action badges better

chrome/common/extensions/extension_action.cc

 // Copyright (c) 2009 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 "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
@@ skipping 88 matching lines @@
   if (text.empty())
     return;
 
   SkColor text_color = GetBadgeTextColor(tab_id);
   SkColor background_color = GetBadgeBackgroundColor(tab_id);
 
   if (SkColorGetA(text_color) == 0x00)
     text_color = SK_ColorWHITE;
 
   if (SkColorGetA(background_color) == 0x00)
-    background_color = SkColorSetARGB(255, 218, 0, 24);  // default badge color
+    background_color = SkColorSetARGB(255, 218, 0, 24);  // Default badge color.
 
   canvas->save();
 
   SkPaint* text_paint = GetTextPaint();
   text_paint->setColor(text_color);
 
   // Calculate text width. We clamp it to a max size.
   SkScalar text_width = text_paint->measureText(text.c_str(), text.size());
   text_width = SkIntToScalar(
       std::min(kMaxTextWidth, SkScalarFloor(text_width)));
 
-  // Cacluate badge size. It is clamped to a min width just because it looks
+  // Calculate badge size. It is clamped to a min width just because it looks
   // silly if it is too skinny.
   int badge_width = SkScalarFloor(text_width) + kPadding * 2;
+  int icon_width = GetIcon(tab_id).width();
+  // Force the pixel width of badge to be either odd (if the icon width is odd)
+  // or even otherwise. If there is a mismatch you get http://crbug.com/26400.
+  if (icon_width != 0 && (badge_width % 2 != GetIcon(tab_id).width() % 2))
+    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(bounds.CenterPoint().x() - badge_width / 2);
+    rect.fLeft = SkIntToScalar(
+                     SkScalarFloor(SkIntToScalar(bounds.width() / 2.0) -
+                                   SkIntToScalar(badge_width / 2.0)));
     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);
@@ skipping 22 matching lines @@
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->clipRect(rect);
   canvas->drawText(text.c_str(), text.size(),
                    rect.fLeft + (rect.width() - text_width) / 2,
                    rect.fTop + kTextSize + kTopTextPadding,
                    *text_paint);
   canvas->restore();
 }