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

Unified Diff: chrome/browser/icon_loader_mac.mm

Issue 10820049: Load 2x resources on demand (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated comment 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
« no previous file with comments | « chrome/browser/icon_loader_linux.cc ('k') | chrome/browser/icon_loader_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/icon_loader_mac.mm
diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm
index 7ec09ac2419d59cc165518006f63e33f92a0b4b6..7313a69d817a998a94b187f2b2ed08fc4b0540f7 100644
--- a/chrome/browser/icon_loader_mac.mm
+++ b/chrome/browser/icon_loader_mac.mm
@@ -33,7 +33,9 @@ void IconLoader::ReadIcon() {
default:
NOTREACHED();
}
- image_.reset(new gfx::Image(gfx::ImageSkiaFromResizedNSImage(icon, size)));
+ gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));
+ image_skia.MakeThreadSafe();
+ image_.reset(new gfx::Image(image_skia));
}
target_message_loop_->PostTask(FROM_HERE,
« no previous file with comments | « chrome/browser/icon_loader_linux.cc ('k') | chrome/browser/icon_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698