Fix bug in browser action icon scaling for non-1x scale factors.

chrome/browser/ui/extensions/icon_with_badge_image_source.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/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/browser/extensions/extension_action.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 59 matching lines @@
       DCHECK(typeface);
     }
 
     text_paint->setTypeface(typeface.get());
     // |text_paint| adds its own ref. Release the ref from CreateFontName.
   }
   return text_paint;
 }
 
 gfx::ImageSkiaRep ScaleImageSkiaRep(const gfx::ImageSkiaRep& rep,
-                                    int target_width,
+                                    int target_width_dp,
                                     float target_scale) {
+  int width_px = target_width_dp * target_scale;
   return gfx::ImageSkiaRep(
       skia::ImageOperations::Resize(rep.sk_bitmap(),
                                     skia::ImageOperations::RESIZE_BEST,
-                                    target_width, target_width),
+                                    width_px, width_px),
       target_scale);
 }
 
 }  // namespace
 
 IconWithBadgeImageSource::Badge::Badge(const std::string& text,
                                        SkColor text_color,
                                        SkColor background_color)
     : text(text), text_color(text_color), background_color(background_color) {}
 
@@ skipping 14 matching lines @@
   badge_ = std::move(badge);
 }
 
 void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
   if (icon_.IsEmpty())
     return;
 
   gfx::ImageSkia skia = icon_.AsImageSkia();
   gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
   if (rep.scale() != canvas->image_scale()) {
-    skia.AddRepresentation(
-        ScaleImageSkiaRep(rep, skia.width(), canvas->image_scale()));
+    skia.AddRepresentation(ScaleImageSkiaRep(
+        rep, ExtensionAction::ActionIconSize(), canvas->image_scale()));

[varkha, 2016/01/26 16:18:41]

nit: could cache ExtensionAction::ActionIconSize() return value.

   }
   if (grayscale_)
     skia = gfx::ImageSkiaOperations::CreateHSLShiftedImage(skia, {-1, 0, 0.6});
 
-  int x_offset = std::floor((size().width() - icon_.Width()) / 2.0);
-  int y_offset = std::floor((size().height() - icon_.Height()) / 2.0);
+  int x_offset =
+      std::floor((size().width() - ExtensionAction::ActionIconSize()) / 2.0);
+  int y_offset =
+      std::floor((size().height() - ExtensionAction::ActionIconSize()) / 2.0);
   canvas->DrawImageInt(skia, x_offset, y_offset);
 
   // Draw a badge on the provided browser action icon's canvas.
   PaintBadge(canvas);
 
   if (paint_decoration_)
     PaintDecoration(canvas);
 }
 
 // Paints badge with specified parameters to |canvas|.
@@ skipping 120 matching lines @@
   gfx::Point center_point(major_radius + 1, size().height() - (major_radius)-1);
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(SK_ColorTRANSPARENT);
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   canvas->DrawCircle(center_point, major_radius, paint);
   paint.setColor(decoration_color);
   canvas->DrawCircle(center_point, minor_radius, paint);
 }