diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 05:48:54 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 05:48:54 +0000 |
| commit | 2b4f7e7be99649ad667ec6658448dcebc75ec124 (patch) | |
| tree | ae4ecaed0c7f891bd20a2f2e53229e9c082c605e /chrome/browser/icon_loader_linux.cc | |
| parent | 701d1e8389d6f6b93f557e0a73b79ccaea5b8ac6 (diff) | |
| download | chromium_src-2b4f7e7be99649ad667ec6658448dcebc75ec124.zip chromium_src-2b4f7e7be99649ad667ec6658448dcebc75ec124.tar.gz chromium_src-2b4f7e7be99649ad667ec6658448dcebc75ec124.tar.bz2 | |
Revert 136823 - Get rid of Image::Image(SkBitmap*); because of win build failure
Bug=124566
Test=Compiles on CrOS,Mac
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136812
Review URL: https://chromiumcodereview.appspot.com/10378009
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10392075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader_linux.cc')
| -rw-r--r-- | chrome/browser/icon_loader_linux.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc index f0bb1e6..b70dfd8 100644 --- a/chrome/browser/icon_loader_linux.cc +++ b/chrome/browser/icon_loader_linux.cc @@ -40,14 +40,14 @@ void IconLoader::ReadIcon() { file_util::ReadFileToString(filename, &icon_data); webkit_glue::ImageDecoder decoder; - SkBitmap bitmap; - bitmap = decoder.Decode( + scoped_ptr<SkBitmap> bitmap(new SkBitmap()); + *bitmap = decoder.Decode( reinterpret_cast<const unsigned char*>(icon_data.data()), icon_data.length()); - if (!bitmap.empty()) { - DCHECK_EQ(size_pixels, bitmap.width()); - DCHECK_EQ(size_pixels, bitmap.height()); - image_.reset(new gfx::Image(bitmap)); + if (!bitmap->empty()) { + DCHECK_EQ(size_pixels, bitmap->width()); + DCHECK_EQ(size_pixels, bitmap->height()); + image_.reset(new gfx::Image(bitmap.release())); } else { LOG(WARNING) << "Unsupported file type or load error: " << filename.value(); |