Backed out changeset 01d5bde15738 (bug 893973) for OSX bustage.

CLOSED TREE

widget/cocoa/nsChildView.mm

@@ -66,9 +66,6 @@
 #include "nsAccessibilityService.h"
 #include "mozilla/a11y/Platform.h"
 #endif
-#ifdef MOZ_CRASHREPORTER
-#include "nsExceptionHandler.h"
-#endif
 
 #include "mozilla/Preferences.h"
 
@@ -5212,40 +5209,16 @@ static int32_t RoundUp(double aDouble)
 
 #if !defined(RELEASE_BUILD) || defined(DEBUG)
   if (mGeckoChild && mTextInputHandler && mTextInputHandler->IsFocused()) {
-#ifdef MOZ_CRASHREPORTER
-    NSWindow* window = [self window];
-    NSString* info = [NSString stringWithFormat:@"view [%@], window [%@], key event [%@], window is key %i, app is active %i",
-                      self, window, theEvent, [window isKeyWindow], [NSApp isActive]];
-    nsAutoCString additionalInfo([info UTF8String]);
-#endif
     if (mIsPluginView) {
       if (TextInputHandler::IsSecureEventInputEnabled()) {
-        nsAutoCString message("While a plugin has focus, we must not be in secure mode");
+        MOZ_CRASH("While a plugin has focus, we must not be in secure mode");
-#ifdef MOZ_CRASHREPORTER
-        CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("\nBug 893973: ") +
-                                                   message);
-        CrashReporter::AppendAppNotesToCrashReport(additionalInfo);
-#endif
-        MOZ_CRASH(PromiseFlatCString(message).get());
       }
     } else if (mGeckoChild->GetInputContext().IsPasswordEditor() &&
                !TextInputHandler::IsSecureEventInputEnabled()) {
-      nsAutoCString message("A password editor has focus, but not in secure input mode");
+      MOZ_CRASH("A password editor has focus, but not in secure input mode");
-#ifdef MOZ_CRASHREPORTER
-      CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("\nBug 893973: ") +
-                                                 message);
-      CrashReporter::AppendAppNotesToCrashReport(additionalInfo);
-#endif
-      MOZ_CRASH(PromiseFlatCString(message).get());
     } else if (!mGeckoChild->GetInputContext().IsPasswordEditor() &&
                TextInputHandler::IsSecureEventInputEnabled()) {
-      nsAutoCString message("A non-password editor has focus, but in secure input mode");
+      MOZ_CRASH("A non-password editor has focus, but in secure input mode");
-#ifdef MOZ_CRASHREPORTER
-      CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("\nBug 893973: ") +
-                                                 message);
-      CrashReporter::AppendAppNotesToCrashReport(additionalInfo);
-#endif
-      MOZ_CRASH(PromiseFlatCString(message).get());
     }
   }
 #endif // #if !defined(RELEASE_BUILD) || defined(DEBUG)