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 466 matching lines @@
       FROM_HERE,
       base::Bind(&WallpaperManager::CacheThumbnail,
                  base::Unretained(this), email, 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);
+  gfx::ImageSkia thumbnail = gfx::ImageSkiaOperations::CreateResizedImage(

[sky, 2012/08/16 16:25:59]

This code runs off the UI thread. I don't think ImageSkia is really thread safe.
Won't this introduce race conditions?

[sadrul, 2012/08/16 17:15:12]

Ah, very interesting. I think we already have this problem in the current code?

+      wallpaper,
+      skia::ImageOperations::RESIZE_LANCZOS3,
+      gfx::Size(kThumbnailWidth, kThumbnailHeight));
   custom_wallpaper_thumbnail_cache_[email] = thumbnail;
 }
 
 void WallpaperManager::FetchWallpaper(const std::string& email,
                                       ash::WallpaperLayout layout,
                                       const UserImage& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
@@ skipping 39 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);
+  gfx::ImageSkia thumbnail = gfx::ImageSkiaOperations::CreateResizedImage(
+      wallpaper,
+      skia::ImageOperations::RESIZE_LANCZOS3,
+      gfx::Size(kThumbnailWidth, kThumbnailHeight));
 
   custom_wallpaper_thumbnail_cache_[email] = thumbnail;
 
   // Notify thumbnail is ready.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WallpaperManager::OnThumbnailUpdated,
                  base::Unretained(this), delegate));
 }
@@ skipping 51 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos