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

Unified Diff: chrome/browser/chrome_browser_application_mac.mm

Issue 7038010: [Mac] Allow NSExceptions in certain cases. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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
Index: chrome/browser/chrome_browser_application_mac.mm
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm
index 745e0ab4dbb9396913f4db9a7f0da5232da12271..f070efac4d7abc1db2de239d41e434a3b005d9c8 100644
--- a/chrome/browser/chrome_browser_application_mac.mm
+++ b/chrome/browser/chrome_browser_application_mac.mm
@@ -5,6 +5,7 @@
#import "chrome/browser/chrome_browser_application_mac.h"
#import "base/logging.h"
+#import "base/mac/scoped_nsexception_enabler.h"
#import "base/metrics/histogram.h"
#import "base/memory/scoped_nsobject.h"
#import "base/sys_string_conversions.h"
@@ -93,7 +94,8 @@ static IMP gOriginalInitIMP = NULL;
// (destructors are skipped). Chrome should be NSException-free,
// please check your backtrace and see if you can't file a bug
// with a repro case.
- if (fatal) {
+ const bool allow = base::mac::GetNSExceptionsAllowed();
+ if (fatal && allow) {
Mark Mentovai 2011/05/17 19:07:34 If the exception is “fatal” because it matched som
Scott Hess - ex-Googler 2011/05/17 19:34:40 Crap, did I get that backwards? I had another CL
Scott Hess - ex-Googler 2011/05/17 20:00:44 Indeed, my forced exceptions were all NSGenericExc
LOG(FATAL) << "Someone is trying to raise an exception! "
<< base::SysNSStringToUTF8(value);
} else {
@@ -101,7 +103,7 @@ static IMP gOriginalInitIMP = NULL;
// exceptions.
DLOG(ERROR) << "Someone is trying to raise an exception! "
<< base::SysNSStringToUTF8(value);
- NOTREACHED();
+ DCHECK(allow);
}
}
@@ -306,6 +308,18 @@ BOOL SwizzleNSExceptionInit() {
}
}
+ // Certain third-party code, such as print drivers, can still throw
+ // exceptions and Chromium cannot fix them. This provides a way to
+ // work around those on a spot basis.
+ bool enableNSExceptions = false;
+
+ // http://crbug.com/80686 , an Epson printer driver.
+ if (anAction == @selector(selectPDE:)) {
+ enableNSExceptions = true;
+ }
+
+ base::mac::ScopedNSExceptionEnabler enabler(enableNSExceptions);
Mark Mentovai 2011/05/17 19:07:34 I’d prefer to get this as close to [super sendActi
+
// When a Cocoa control is wired to a freed object, we get crashers
// in the call to |super| with no useful information in the
// backtrace. Attempt to add some useful information.
@@ -354,6 +368,11 @@ BOOL SwizzleNSExceptionInit() {
// addressed elsewhere.
[self clearIsHandlingSendEvent];
+ // If |ScopedNSExceptionEnabler| is used to allow exceptions, and
+ // an uncaught exception is thrown, the flag must be reset so that
+ // future exceptions are not masked.
+ base::mac::SetNSExceptionsAllowed(false);
stuartmorgan 2011/05/17 18:52:14 Given that you've designed these to nest arbitrari
Mark Mentovai 2011/05/17 19:07:34 false instead of the original “was” value? (which
Scott Hess - ex-Googler 2011/05/17 19:34:40 In the 32-bit runtime, you cannot use C++ scoped o
Scott Hess - ex-Googler 2011/05/17 19:34:40 This is effectively the outermost scope.
+
// Store some human-readable information in breakpad keys in case
// there is a crash. Since breakpad does not provide infinite
// storage, we track two exceptions. The first exception thrown

Powered by Google App Engine
This is Rietveld 408576698