Fix the crash in DesktopBackgroundView::OnPaint

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 <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_resources.h"
@@ skipping 466 matching lines @@
   // If decoded wallpaper is empty, we are probably failed to decode the file.
   // Use default wallpaper in this case.
   if (wallpaper.image().isNull()) {
     ash::Shell::GetInstance()->desktop_background_controller()->
         SetDefaultWallpaper(ash::GetDefaultWallpaperIndex());
     return;
   }
 
   bool is_persistent = ShouldPersistDataForUser(username);
 
+  wallpaper.image().EnsureRepsForSupportedScaleFactors();
+  scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper.image().DeepCopy());
+
+  WallpaperInfo info = {
+      wallpaper_path,
+      layout,
+      User::CUSTOMIZED,

[oshima, 2012/11/13 17:46:42]

shouldn't this be "type"?

[bshe, 2012/11/13 21:18:45]

Aha. You are right. Sorry.

+      base::Time::Now().LocalMidnight()

[oshima, 2012/11/13 17:46:42]

add comment that this isn't used.

[bshe, 2012/11/13 21:18:45]

Done.

+  };
   BrowserThread::PostTask(
-      BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&WallpaperManager::GenerateUserWallpaperThumbnail,
-                 base::Unretained(this), username, type, delegate,
-                 wallpaper.image()));
-
-  if (is_persistent) {
-    BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
-        base::Bind(&WallpaperManager::SaveCustomWallpaper,
+        base::Bind(&WallpaperManager::ProcessCustomWallpaper,
                    base::Unretained(this),
                    username,
-                   FilePath(wallpaper_path),
-                   layout,
-                   wallpaper));
-  }
-
+                   is_persistent,
+                   info,
+                   delegate,
+                   base::Passed(&deep_copy),
+                   wallpaper.raw_image()));

[oshima, 2012/11/12 16:39:28]

Can you remove or update TODO for raw_image()? This may break if RawImage
introduces RefCount

[bshe, 2012/11/12 19:12:48]

Good point. Added a TODO.

On 2012/11/12 16:39:28, oshima wrote:

   ash::Shell::GetInstance()->desktop_background_controller()->
       SetCustomWallpaper(wallpaper.image(), layout);
 
   bool new_wallpaper_ui_disabled = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableNewWallpaperUI);
   if (!new_wallpaper_ui_disabled) {
     // User's custom wallpaper path is determined by username/email and the
     // appropriate wallpaper resolution in GetCustomWallpaperInternal. So use
     // DUMMY as file name here.
     WallpaperInfo info = {
@@ skipping 288 matching lines @@
     if (type == User::CUSTOMIZED) {
       GetCustomWallpaper(email, false /* do not update wallpaper */);
       return;
     }
     ash::Shell::GetInstance()->desktop_background_controller()->
         CacheDefaultWallpaper(index);
   }
 }
 
 void WallpaperManager::CacheThumbnail(const std::string& email,
-                                      const gfx::ImageSkia& wallpaper) {
+                                      scoped_ptr<gfx::ImageSkia> wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  custom_wallpaper_thumbnail_cache_[email] = GetWallpaperThumbnail(wallpaper);
+  custom_wallpaper_thumbnail_cache_[email] =
+      GetWallpaperThumbnail(*wallpaper.get());
 }
 
 void WallpaperManager::DeleteWallpaperInList(
     const std::vector<FilePath>& file_list) {
   for (std::vector<FilePath>::const_iterator it = file_list.begin();
        it != file_list.end(); ++it) {
     FilePath path = *it;
     if (!file_util::Delete(path, false)) {
       LOG(ERROR) << "Failed to remove user wallpaper.";
     }
@@ skipping 330 matching lines @@
 
     if (update_wallpaper) {
       ash::Shell::GetInstance()->desktop_background_controller()->
           SetDefaultWallpaper(ash::GetDefaultWallpaperIndex());
     } else {
       ash::Shell::GetInstance()->desktop_background_controller()->
           CacheDefaultWallpaper(ash::GetDefaultWallpaperIndex());
     }
     return;
   }
+  // Generate all reps before passing to another thread.
+  wallpaper.image().EnsureRepsForSupportedScaleFactors();
+  scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper.image().DeepCopy());
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&WallpaperManager::CacheThumbnail,
                  base::Unretained(this), email,
-                 wallpaper.image().DeepCopy()));
+                 base::Passed(&deep_copy)));
   // Only cache user wallpaper at login screen.
   if (!UserManager::Get()->IsUserLoggedIn()) {
     wallpaper_cache_.insert(std::make_pair(email, wallpaper.image()));
   }
   if (update_wallpaper) {
     ash::Shell::GetInstance()->desktop_background_controller()->
         SetCustomWallpaper(wallpaper.image(), layout);
   }
 }
 
+void WallpaperManager::ProcessCustomWallpaper(
+    const std::string& email,
+    bool persistent,
+    const WallpaperInfo& info,
+    base::WeakPtr<WallpaperDelegate> delegate,
+    scoped_ptr<gfx::ImageSkia> image,
+    const UserImage::RawImage& raw_image) {
+  UserImage wallpaper(*image.get(), raw_image);
+  GenerateUserWallpaperThumbnail(email, info.type, delegate, wallpaper.image());
+  if (persistent)
+    SaveCustomWallpaper(email, FilePath(info.file), info.layout, wallpaper);
+}
+
+
+
 void WallpaperManager::OnWallpaperEncoded(const FilePath& path,
     scoped_refptr<base::RefCountedBytes> data) {
   SaveWallpaperInternal(path,
                         reinterpret_cast<const char*>(data->front()),
                         data->size());
 }
 
 void WallpaperManager::SaveCustomWallpaper(const std::string& email,
                                            const FilePath& path,
                                            ash::WallpaperLayout layout,
@@ skipping 83 matching lines @@
                           FROM_HERE,
                           base::Bind(&WallpaperManager::StartLoad,
                                      base::Unretained(this),
                                      email,
                                      info,
                                      update_wallpaper,
                                      valid_path));
 }
 
 }  // chromeos