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 19:33:13 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-21 19:33:13 +0000
commit945c16c976d14eb0944ffaaadae040cad4262c0c (patch)
tree4c44a9abaebf7436c89ceeb7bb1f096f18333784 /chrome/common/resource_bundle.cc
parent9638a0712a9a1f7fe7404f0f6b1bb6d6c0cfa13a (diff)
downloadchromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.zip
chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.tar.gz
chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.tar.bz2
Unrollback r1158.
BUG=1296800 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_bundle.cc')
-rw-r--r--chrome/common/resource_bundle.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc
index 3beccb4..09dbf19 100644
--- a/chrome/common/resource_bundle.cc
+++ b/chrome/common/resource_bundle.cc
@@ -195,13 +195,8 @@ 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;
}