Merge m-c to inbound
authorWes Kocher <wkocher@mozilla.com>
Wed, 31 Jul 2013 17:36:03 -0700
changeset 153124 dba9ab6684dc807a975f628d30d366c7d1037745
parent 153123 f775819f6b482387e9e1fbd23d4aa43bc525d2e7 (current diff)
parent 153099 05d3797276d3d8c7d10ddc66e95c99352c2e3cc9 (diff)
child 153125 acf95e69c5e842b8af2aceec0086b831c3e8f915
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -5218,19 +5218,18 @@ static int32_t RoundUp(double aDouble)
 - (void)keyDown:(NSEvent*)theEvent
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #if !defined(RELEASE_BUILD) || defined(DEBUG)
   if (mGeckoChild && mTextInputHandler && mTextInputHandler->IsFocused()) {
 #ifdef MOZ_CRASHREPORTER
     NSWindow* window = [self window];
-    NSString* info = [NSString stringWithFormat:@"\nview [%@], window [%@], key event [%@], window is key %i, is fullscreen %i, is zoomed %i, app is active %i",
-                      self, window, theEvent, [window isKeyWindow], ([window styleMask] & (1 << 14)) != 0,
-                      [window isZoomed], [NSApp isActive]];
+    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()) {
         #define CRASH_MESSAGE "While a plugin has focus, we must not be in secure mode"
 #ifdef MOZ_CRASHREPORTER
         CrashReporter::AppendAppNotesToCrashReport(NS_LITERAL_CSTRING("\nBug 893973: ") +
                                                    NS_LITERAL_CSTRING(CRASH_MESSAGE));