Enable robust decoding of custom wallpaper and allow custom wallpaper on login page

chrome/browser/chromeos/login/user_image_loader.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/user_image_loader.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 
 UserImageLoader::ImageInfo::ImageInfo(int size,
                                       const LoadedCallback& loaded_cb)
     : size(size),
       loaded_cb(loaded_cb) {
 }
 
 UserImageLoader::ImageInfo::~ImageInfo() {
 }
 
-UserImageLoader::UserImageLoader()
-    : target_message_loop_(NULL) {
+UserImageLoader::UserImageLoader(ImageDecoder::ImageCodec image_codec)
+    : target_message_loop_(NULL),
+      image_codec_(image_codec) {
 }
 
 UserImageLoader::~UserImageLoader() {
 }
 
 void UserImageLoader::Start(const std::string& filepath,
                             int size,
                             const LoadedCallback& loaded_cb) {
   target_message_loop_ = MessageLoop::current();
 
   ImageInfo image_info(size, loaded_cb);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&UserImageLoader::LoadImage, this, filepath, image_info));
 }
 
 void UserImageLoader::LoadImage(const std::string& filepath,
                                 const ImageInfo& image_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::string image_data;
   file_util::ReadFileToString(FilePath(filepath), &image_data);
 
   scoped_refptr<ImageDecoder> image_decoder =
-      new ImageDecoder(this, image_data, ImageDecoder::DEFAULT_CODEC);
+      new ImageDecoder(this, image_data, image_codec_);
   image_info_map_.insert(std::make_pair(image_decoder.get(), image_info));
   image_decoder->Start();
 }
 
 void UserImageLoader::OnImageDecoded(const ImageDecoder* decoder,
                                      const SkBitmap& decoded_image) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   ImageInfoMap::iterator info_it = image_info_map_.find(decoder);
   if (info_it == image_info_map_.end()) {
@@ skipping 27 matching lines @@
   target_message_loop_->PostTask(
       FROM_HERE,
       base::Bind(image_info.loaded_cb,
                  UserImage(final_image_skia, decoder->get_image_data())));
 
   image_info_map_.erase(info_it);
 }
 
 void UserImageLoader::OnDecodeImageFailed(const ImageDecoder* decoder) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+
+  ImageInfoMap::iterator info_it = image_info_map_.find(decoder);
+  if (info_it == image_info_map_.end()) {
+    NOTREACHED();
+    return;
+  }
+
+  const ImageInfo& image_info = info_it->second;
+  target_message_loop_->PostTask(
+      FROM_HERE,
+      base::Bind(image_info.loaded_cb, UserImage()));
   image_info_map_.erase(decoder);
 }
 
 }  // namespace chromeos