Merge m-c to inbound

This commit is contained in:
Wes Kocher 2013-07-31 17:36:03 -07:00
commit 4b7937b86f

View File

@ -5223,9 +5223,8 @@ static int32_t RoundUp(double aDouble)
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) {