Load 2x resources on demand

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/desktop_background/desktop_background_resources.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 58 matching lines @@
 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]);
-  }
-
+  thumbnail.MakeThreadSafe();
   return thumbnail;
 }
 
-gfx::ImageSkia ImageSkiaDeepCopy(const gfx::ImageSkia& image) {
-  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 88 matching lines @@
                                             suffix);
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   return user_data_dir.AppendASCII(filename);
 }
 
 gfx::ImageSkia WallpaperManager::GetCustomWallpaperThumbnail(
     const std::string& email) {
   CustomWallpaperMap::const_iterator it =
       custom_wallpaper_thumbnail_cache_.find(email);
-  if (it != wallpaper_cache_.end())
+  if (it != custom_wallpaper_thumbnail_cache_.end())
     return (*it).second;
   else
     return gfx::ImageSkia();
 }
 
 void WallpaperManager::GetLoggedInUserWallpaperProperties(
     User::WallpaperType* type,
     int* index,
     base::Time* last_modification_date) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 400 matching lines @@
 void WallpaperManager::CacheWallpaper(const std::string& email,
                                       const UserImage& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(wallpaper_cache_.find(email) == wallpaper_cache_.end());
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&WallpaperManager::CacheThumbnail,
                  base::Unretained(this), email,
-                 ImageSkiaDeepCopy(wallpaper.image())));
+                 wallpaper.image().DeepCopy()));
 
   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));
   custom_wallpaper_thumbnail_cache_[email] = GetWallpaperThumbnail(wallpaper);
 }
 
@@ skipping 21 matching lines @@
 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,
-                 ImageSkiaDeepCopy(wallpaper.image())));
-
+                 wallpaper.image().DeepCopy()));
   wallpaper_cache_.insert(std::make_pair(email, wallpaper.image()));
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetCustomWallpaper(wallpaper.image(), layout);
 }
 
 bool WallpaperManager::GetUserWallpaperInfo(const std::string& email,
                                             WallpaperInfo* info){
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!ShouldPersistDataForUser(email)) {
@@ skipping 230 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos