ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image.

chrome/browser/ui/web_applications/web_app_ui.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/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_family.h"
+#include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/environment.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #endif
 
@@ skipping 146 matching lines @@
   std::vector<ui::ScaleFactor> scale_factors;
   scale_factors.push_back(ui::SCALE_FACTOR_100P);
 
   size_t closest_index =
       FaviconUtil::SelectBestFaviconFromBitmaps(bitmaps,
                                                 scale_factors,
                                                 requested_size);
 
   if (!bitmaps.empty() && !bitmaps[closest_index].isNull()) {
     // Update icon with download image and update shortcut.
-    shortcut_info_.favicon =
-        gfx::Image::CreateFrom1xBitmap(bitmaps[closest_index]);
+    shortcut_info_.favicon.Add(
+        gfx::Image::CreateFrom1xBitmap(bitmaps[closest_index]));
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(web_contents_);
     extensions_tab_helper->SetAppIcon(bitmaps[closest_index]);
     UpdateShortcuts();
   } else {
     // Try the next icon otherwise.
     DownloadIcon();
   }
 }
 
@@ skipping 53 matching lines @@
   // Ensure web_app_path exists. web_app_path could be missing for a legacy
   // shortcut created by Gears.
   if (!file_util::PathExists(web_app_path) &&
       !file_util::CreateDirectory(web_app_path)) {
     NOTREACHED();
     return;
   }
 
   base::FilePath icon_file = web_app_path.Append(file_name_).ReplaceExtension(
       FILE_PATH_LITERAL(".ico"));
-  web_app::internals::CheckAndSaveIcon(icon_file,
-                                       *shortcut_info_.favicon.ToSkBitmap());
+  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info_.favicon);
 
   // Update existing shortcuts' description, icon and app id.
   CheckExistingShortcuts();
   if (!shortcut_files_.empty()) {
     // Generates app id from web app url and profile path.
     string16 app_id = ShellIntegration::GetAppModelIdForProfile(
         UTF8ToWide(web_app::GenerateApplicationNameFromURL(shortcut_info_.url)),
         profile_path_);
 
     // Sanitize description
@@ skipping 40 matching lines @@
                    const gfx::Image& image) {
   // If the image failed to load (e.g. if the resource being loaded was empty)
   // use the standard application icon.
   if (image.IsEmpty()) {
     gfx::Image default_icon =
         ResourceBundle::GetSharedInstance().GetImageNamed(IDR_APP_DEFAULT_ICON);
     int size = kDesiredSizes[arraysize(kDesiredSizes) - 1];
     SkBitmap bmp = skia::ImageOperations::Resize(
           *default_icon.ToSkBitmap(), skia::ImageOperations::RESIZE_BEST,
           size, size);
-    shortcut_info.favicon = gfx::Image::CreateFrom1xBitmap(bmp);
+    shortcut_info.favicon.Add(gfx::Image::CreateFrom1xBitmap(bmp));
   } else {
-    shortcut_info.favicon = image;
+    // As described in UpdateShortcutInfoAndIconForApp, image contains all of
+    // the icons, hackily put into a single ImageSkia. Separate them out into
+    // individual ImageSkias and insert them into the icon family.
+    const gfx::ImageSkia& multires_image_skia = *(image.ToImageSkia());
+    // NOTE: Do not call ImageSkia::EnsureRepsForSupportedScaleFactors here.
+    // The image reps here are not really scale factors (ImageSkia is just being
+    // used as a handy container for multiple images), so it doesn't make sense
+    // to get other supported scale factors.
+    std::vector<gfx::ImageSkiaRep> image_reps =
+        multires_image_skia.image_reps();
+    for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
+         it != image_reps.end(); ++it) {
+      const gfx::ImageSkiaRep& image = *it;
+      gfx::ImageSkia image_skia(image);
+      image_skia.MakeThreadSafe();
+      shortcut_info.favicon.Add(image_skia);
+    }
   }
 
   callback.Run(shortcut_info);
 }
 
 }  // namespace
 
 namespace web_app {
 
 ShellIntegration::ShortcutInfo ShortcutInfoForExtensionAndProfile(
@@ skipping 13 matching lines @@
       extensions::TabHelper::FromWebContents(web_contents);
   const WebApplicationInfo& app_info = extensions_tab_helper->web_app_info();
 
   info->url = app_info.app_url.is_empty() ? web_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
       (web_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
                                           web_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
-  info->favicon = gfx::Image(favicon_tab_helper->GetFavicon());
+  info->favicon.Add(favicon_tab_helper->GetFavicon());
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   info->profile_path = profile->GetPath();
 }
 
 void UpdateShortcutForTabContents(WebContents* web_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
@@ skipping 13 matching lines @@
   shortcut_info->profile_path = profile->GetPath();
 }
 
 void UpdateShortcutInfoAndIconForApp(
     const extensions::Extension& extension,
     Profile* profile,
     const web_app::ShortcutInfoCallback& callback) {
   ShellIntegration::ShortcutInfo shortcut_info =
       ShortcutInfoForExtensionAndProfile(&extension, profile);
 
+  // We want to load each icon into a separate ImageSkia to insert into an
+  // ImageFamily, but LoadImagesAsync currently only builds a single ImageSkia.
+  // Hack around this by loading all images into the ImageSkia as 100%
+  // representations, and later (in OnImageLoaded), pulling them out and
+  // individually inserting them into an ImageFamily.

[benwells, 2013/04/04 04:58:30]

Should we change LoadImagesAsync to use ImageFamily as well?

[Matt Giuca, 2013/04/04 05:15:36]

Yes, I intend to do this in a separate CL.

   std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
   for (size_t i = 0; i < arraysize(kDesiredSizes); ++i) {
     int size = kDesiredSizes[i];
     extensions::ExtensionResource resource =
         extensions::IconsInfo::GetIconResource(
             &extension, size, ExtensionIconSet::MATCH_EXACTLY);
     if (!resource.empty()) {
       info_list.push_back(extensions::ImageLoader::ImageRepresentation(
           resource,
           extensions::ImageLoader::ImageRepresentation::RESIZE_WHEN_LARGER,
@@ skipping 24 matching lines @@
   }
 
   // |info_list| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,
       base::Bind(&OnImageLoaded, shortcut_info, callback));
 }
 
 }  // namespace web_app