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 /ui/base | |
| 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 'ui/base')
| -rw-r--r-- | ui/base/resource/resource_bundle.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index 9de5a4f..f84e8db 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -467,10 +467,10 @@ gfx::Image& ResourceBundle::GetEmptyImage() { if (empty_image_.IsEmpty()) { // The placeholder bitmap is bright red so people notice the problem. - SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, 32, 32); - bitmap.allocPixels(); - bitmap.eraseARGB(255, 255, 0, 0); + SkBitmap* bitmap = new SkBitmap(); + bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32); + bitmap->allocPixels(); + bitmap->eraseARGB(255, 255, 0, 0); empty_image_ = gfx::Image(bitmap); } return empty_image_; |