Load extension icons for more scale factors.

extensions/browser/extension_icon_image.cc

 // Copyright 2014 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 "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 
 // The ImageSkia provided by extensions::IconImage contains ImageSkiaReps that
 // are computed and updated using the following algorithm (if no default icon
 // was supplied, transparent icon is considered the default):
-// - |LoadImageForScaleFactors()| searches the extension for an icon of an
+// - |LoadImageForScale()| searches the extension for an icon of an
 //   appropriate size. If the extension doesn't have a icon resource needed for
 //   the image representation, the default icon's representation for the
 //   requested scale factor is returned by ImageSkiaSource.
 // - If the extension has the resource, IconImage tries to load it using
 //   ImageLoader.
 // - |ImageLoader| is asynchronous.
 //  - ImageSkiaSource will initially return transparent image resource of the
 //    desired size.
 //  - The image will be updated with an appropriate image representation when
 //    the |ImageLoader| finishes. The image representation is chosen the same
@@ skipping 66 matching lines @@
 
 IconImage::Source::~Source() {
 }
 
 void IconImage::Source::ResetHost() {
   host_ = NULL;
 }
 
 gfx::ImageSkiaRep IconImage::Source::GetImageForScale(float scale) {
   gfx::ImageSkiaRep representation;
-  if (host_) {
-    representation =
-        host_->LoadImageForScaleFactor(ui::GetSupportedScaleFactor(scale));
-  }
+  if (host_)
+    representation = host_->LoadImageForScale(scale);
 
   if (!representation.is_null())
     return representation;
 
   return blank_image_.GetRepresentation(scale);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // IconImage
 
@@ skipping 33 matching lines @@
 void IconImage::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 IconImage::~IconImage() {
   for (auto& observer : observers_)
     observer.OnExtensionIconImageDestroyed(this);
   source_->ResetHost();
 }
 
-gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
-    ui::ScaleFactor scale_factor) {
+gfx::ImageSkiaRep IconImage::LoadImageForScale(float scale) {
   // Do nothing if extension is unloaded.
   if (!extension_)
     return gfx::ImageSkiaRep();
 
-  const float scale = ui::GetScaleForScaleFactor(scale_factor);
   const int resource_size_in_pixel =
       static_cast<int>(resource_size_in_dip_ * scale);
 
   extensions::ExtensionResource resource;
 
   // Find extension resource for non bundled component extensions.
   resource =
       GetExtensionIconResource(*extension_, icon_set_, resource_size_in_pixel,
                                ExtensionIconSet::MATCH_BIGGER);
 
   // If resource is not found by now, try matching smaller one.
   if (resource.empty()) {
     resource =
         GetExtensionIconResource(*extension_, icon_set_, resource_size_in_pixel,
                                  ExtensionIconSet::MATCH_SMALLER);
   }
 
   // If there is no resource found, return default icon.
   if (resource.empty())
     return default_icon_.GetRepresentation(scale);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
   info_list.push_back(ImageLoader::ImageRepresentation(
       resource, ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
-      gfx::ScaleToFlooredSize(
-          gfx::Size(resource_size_in_dip_, resource_size_in_dip_), scale),
-      scale_factor));

[Evan Stade, 2017/01/07 01:17:38]

the failure was due to scale_factor being an enum value --- I changed
ImageRepresentation's constructor and this was implicitly cast to float.

I fixed that and also changed more of the ScaleFactors in this file to be float.
Not sure if that's OK, or if there is a reason to use the ScaleFactor enum.
Devlin or Oshima, do you know if converting these ScaleFactors to floats is OK?

[Devlin, 2017/01/09 21:58:33]

As far as I know, this is fine, but oshima@ might know better.

+      gfx::Size(resource_size_in_pixel, resource_size_in_pixel), scale));
 
   extensions::ImageLoader* loader =
       extensions::ImageLoader::Get(browser_context_);
   loader->LoadImagesAsync(extension_.get(), info_list,
                           base::Bind(&IconImage::OnImageLoaded,
                                      weak_ptr_factory_.GetWeakPtr(), scale));
 
   return gfx::ImageSkiaRep();
 }
 
@@ skipping 42 matching lines @@
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_REMOVED);
 
   const Extension* extension = content::Details<const Extension>(details).ptr();
 
   if (extension_.get() == extension)
     extension_ = nullptr;
 }
 
 }  // namespace extensions