summaryrefslogtreecommitdiffstats
path: root/chrome/common/resource_bundle.cc
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-21 18:18:30 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-21 18:18:30 +0000
commit025a16feb0c23574585de20a7bc6524a9a6a1e06 (patch)
tree6199c376b691b50a4b31436a16e9e198a60e8931 /chrome/common/resource_bundle.cc
parentd862fd9d396126f3f06a8061412def6d61d156fd (diff)
downloadchromium_src-025a16feb0c23574585de20a7bc6524a9a6a1e06.zip
chromium_src-025a16feb0c23574585de20a7bc6524a9a6a1e06.tar.gz
chromium_src-025a16feb0c23574585de20a7bc6524a9a6a1e06.tar.bz2
Revert 1158 as it is breaking ui_tests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_bundle.cc')
-rw-r--r--chrome/common/resource_bundle.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc
index 09dbf19..3beccb4 100644
--- a/chrome/common/resource_bundle.cc
+++ b/chrome/common/resource_bundle.cc
@@ -195,8 +195,13 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
// Handle the case where loading the bitmap failed.
if (!bitmap) {
LOG(WARNING) << "Unable to load bitmap with id " << resource_id;
+ NOTREACHED(); // Want to assert in debug mode.
if (!empty_bitmap) {
+ // The placeholder bitmap is bright red so people notice the problem.
empty_bitmap = new SkBitmap();
+ empty_bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
+ empty_bitmap->allocPixels();
+ empty_bitmap->eraseARGB(255, 255, 0, 0);
}
return empty_bitmap;
}