Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4014)

Unified Diff: chrome/browser/chromeos/login/user_image_loader.cc

Issue 10820049: Load 2x resources on demand (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For preview Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/user_image_loader.cc
diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc
index 45f82284b05eb4b63aac1a7f0df683c8ee6176ee..3a3d19a234e259ffcd87ffefc00788e5e651c00f 100644
--- a/chrome/browser/chromeos/login/user_image_loader.cc
+++ b/chrome/browser/chromeos/login/user_image_loader.cc
@@ -15,6 +15,7 @@
#include "skia/ext/image_operations.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/skbitmap_operations.h"
using content::BrowserThread;
@@ -92,11 +93,12 @@ void UserImageLoader::OnImageDecoded(const ImageDecoder* decoder,
final_image = cropped_image;
}
}
-
+ gfx::ImageSkia final_image_skia(final_image);
+ final_image_skia.SetReadOnly();
target_message_loop_->PostTask(
FROM_HERE,
base::Bind(image_info.loaded_cb,
- UserImage(final_image, decoder->get_image_data())));
+ UserImage(final_image_skia, decoder->get_image_data())));
image_info_map_.erase(info_it);
}

Powered by Google App Engine
This is Rietveld 408576698