Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: chrome/common/resource_bundle.cc

Issue 20098: Linux: get us to the point where we crash at browser->window()->Show() (Closed)
Patch Set: Including tony's changes Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pref_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/resource_bundle.cc
diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc
index 785dd299f2eff7734d22dac12b096f9ecba63b89..69318fd321cf62e0532da6bd49c809119d942066 100644
--- a/chrome/common/resource_bundle.cc
+++ b/chrome/common/resource_bundle.cc
@@ -85,6 +85,7 @@ bool ResourceBundle::LoadDataResourceBytes(int resource_id,
}
SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
+#if defined(OS_WIN)
// Check to see if we already have the Skia image in the cache.
{
AutoLock lock_scope(lock_);
@@ -114,10 +115,17 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
return bitmap.release();
}
+#else
+ NOTIMPLEMENTED() << "image resource loading disabled; need data files";
+#endif
// We failed to retrieve the bitmap, show a debugging red square.
{
LOG(WARNING) << "Unable to load bitmap with id " << resource_id;
+#if defined(OS_WIN)
NOTREACHED(); // Want to assert in debug mode.
+#else
+ // TODO(port): remove this exception
+#endif
AutoLock lock_scope(lock_); // Guard empty_bitmap initialization.
« no previous file with comments | « chrome/common/pref_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698