diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 05:42:13 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 05:42:13 +0000 |
| commit | 0f6f446b9e6c6ac11b6359d205a88ae80716fa8e (patch) | |
| tree | a5ff46b5753682e67b896befade4a87f094a00f0 | |
| parent | 6bf3cd3e9c14565e9eafd490078b5cf626e3a75d (diff) | |
| download | chromium_src-0f6f446b9e6c6ac11b6359d205a88ae80716fa8e.zip chromium_src-0f6f446b9e6c6ac11b6359d205a88ae80716fa8e.tar.gz chromium_src-0f6f446b9e6c6ac11b6359d205a88ae80716fa8e.tar.bz2 | |
Fix ImageSkia CHECK(CanRead()) failure in ILT::LoadResourceOnBlockingPool.
BUG=153460
TEST=Verify no check failure when pinning "File" app or opening it from app list.
R=oshima@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11033019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159835 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/image_loading_tracker.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc index 393c3da..f7cd334 100644 --- a/chrome/browser/extensions/image_loading_tracker.cc +++ b/chrome/browser/extensions/image_loading_tracker.cc @@ -184,11 +184,12 @@ class ImageLoadingTracker::ImageLoader int resource_id) { DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); // TODO(xiyuan): Clean up to use SkBitmap here and in LoadOnBlockingPool. - scoped_ptr<SkBitmap> bitmap(new SkBitmap); - *bitmap = ResourceBundle::GetSharedInstance().GetImageNamed( - resource_id).AsBitmap(); + gfx::ImageSkia image( + *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id)); + image.MakeThreadSafe(); - *bitmap = ResizeIfNeeded(*bitmap, image_info); + scoped_ptr<SkBitmap> bitmap(new SkBitmap); + *bitmap = ResizeIfNeeded(*image.bitmap(), image_info); ReportBack(bitmap.release(), image_info, image_info.desired_size, id); } |