image: Specify the resize-method when resizing ImageSkia.

chrome/browser/chromeos/login/wallpaper_manager.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/chromeos/login/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const int kWallpaperUpdateIntervalSec = 24 * 60 * 60;
 
 const char kWallpaperTypeNodeName[] = "type";
 const char kWallpaperIndexNodeName[] = "index";
@@ skipping 13 matching lines @@
 #else
 const int kDefaultOOBEWallpaperIndex = 0;  // IDR_AURA_WALLPAPERS_ROMAINGUY_0
 #endif
 
 // Names of nodes with info about wallpaper.
 const char kNewWallpaperDateNodeName[] = "date";
 const char kNewWallpaperLayoutNodeName[] = "layout";
 const char kNewWallpaperFileNodeName[] = "file";
 const char kNewWallpaperTypeNodeName[] = "type";
 
+gfx::ImageSkia GetWallpaperThumbnail(const gfx::ImageSkia& wallpaper) {
+  gfx::ImageSkia thumbnail = gfx::ImageSkiaOperations::CreateResizedImage(
+      wallpaper,
+      skia::ImageOperations::RESIZE_LANCZOS3,
+      gfx::Size(kThumbnailWidth, kThumbnailHeight));
+
+  // Ideally, this would call thumbnail.GetRepresentations(). But since that
+  // isn't exposed on non-mac yet, we have to do this here.
+  std::vector<ui::ScaleFactor> scales = ui::GetSupportedScaleFactors();
+  for (size_t i = 0; i < scales.size(); ++i) {
+    if (wallpaper.HasRepresentation(scales[i]))
+      thumbnail.GetRepresentation(scales[i]);
+  }
+
+  return thumbnail;
+}
+
+gfx::ImageSkia ImageSkiaDeepCopy(const gfx::ImageSkia& image) {

[sadrul, 2012/08/16 20:32:56]

Perhaps this should be ImageSkia::DeepCopy instead?

+  gfx::ImageSkia copy;
+  std::vector<gfx::ImageSkiaRep> reps = image.image_reps();
+  for (std::vector<gfx::ImageSkiaRep>::iterator iter = reps.begin();
+      iter != reps.end(); ++iter) {
+    copy.AddRepresentation(*iter);
+  }
+  return copy;
+}
+
 }  // namespace
 
 namespace chromeos {
 
 static WallpaperManager* g_wallpaper_manager = NULL;
 
 // WallpaperManager, public: ---------------------------------------------------
 
 // static
 WallpaperManager* WallpaperManager::Get() {
@@ skipping 425 matching lines @@
 
 void WallpaperManager::CacheWallpaper(const std::string& email,
                                       const UserImage& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(custom_wallpaper_cache_.find(email) == custom_wallpaper_cache_.end());
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&WallpaperManager::CacheThumbnail,
-                 base::Unretained(this), email, wallpaper.image()));
+                 base::Unretained(this), email,
+                 ImageSkiaDeepCopy(wallpaper.image())));
 
   custom_wallpaper_cache_.insert(std::make_pair(email, wallpaper.image()));
 }
 
 void WallpaperManager::CacheThumbnail(const std::string& email,
                                       const gfx::ImageSkia& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  gfx::ImageSkia thumbnail =
-      skia::ImageOperations::Resize(wallpaper,
-                                    skia::ImageOperations::RESIZE_LANCZOS3,
-                                    kThumbnailWidth, kThumbnailHeight);
-  custom_wallpaper_thumbnail_cache_[email] = thumbnail;
+  custom_wallpaper_thumbnail_cache_[email] = GetWallpaperThumbnail(wallpaper);
 }
 
 void WallpaperManager::FetchWallpaper(const std::string& email,
                                       ash::WallpaperLayout layout,
                                       const UserImage& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&WallpaperManager::CacheThumbnail,
-                 base::Unretained(this), email, wallpaper.image()));
+                 base::Unretained(this), email,
+                 ImageSkiaDeepCopy(wallpaper.image())));
 
   custom_wallpaper_cache_.insert(std::make_pair(email, wallpaper.image()));
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetCustomWallpaper(wallpaper.image(), layout);
 }
 
 void WallpaperManager::GetUserWallpaperProperties(const std::string& email,
     User::WallpaperType* type,
     int* index,
     base::Time* last_modification_date) {
@@ skipping 26 matching lines @@
     }
   }
 }
 
 void WallpaperManager::GenerateUserWallpaperThumbnail(
     const std::string& email,
     User::WallpaperType type,
     base::WeakPtr<WallpaperDelegate> delegate,
     const gfx::ImageSkia& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  gfx::ImageSkia thumbnail =
-      skia::ImageOperations::Resize(wallpaper,
-                                    skia::ImageOperations::RESIZE_LANCZOS3,
-                                    kThumbnailWidth, kThumbnailHeight);
-
-  custom_wallpaper_thumbnail_cache_[email] = thumbnail;
+  custom_wallpaper_thumbnail_cache_[email] = GetWallpaperThumbnail(wallpaper);
 
   // Notify thumbnail is ready.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WallpaperManager::OnThumbnailUpdated,
                  base::Unretained(this), delegate));
 }
 
 void WallpaperManager::OnThumbnailUpdated(
@@ skipping 36 matching lines @@
                  base::Unretained(this), username, type, delegate,
                  wallpaper.image()));
 
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetCustomWallpaper(wallpaper.image(), layout);
   SaveUserWallpaperProperties(username, type, layout);
 }
 
 void WallpaperManager::OnWallpaperLoaded(ash::WallpaperLayout layout,
                                          const UserImage& user_image) {
-  const SkBitmap& wallpaper = user_image.image();
-  SetWallpaperFromImageSkia(wallpaper, layout);
+  SetWallpaperFromImageSkia(user_image.image(), layout);
 }
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos