From 40ff9dce9c20d0b4f2593468f3af2d720750f041 Mon Sep 17 00:00:00 2001 From: Steven Michaud Date: Mon, 20 Jul 2009 14:44:25 -0500 Subject: [PATCH] [Mac 10.4] Crash in [@ nsViewManager::IsViewInserted(nsView*)] using Google Toolbar. b=503391 r=josh --- widget/src/cocoa/nsCocoaWindow.mm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm index f8e1f49cdb63..5b29f53f3d2c 100644 --- a/widget/src/cocoa/nsCocoaWindow.mm +++ b/widget/src/cocoa/nsCocoaWindow.mm @@ -783,22 +783,8 @@ NS_IMETHODIMP nsCocoaWindow::Show(PRBool bState) // the NSApplication class (in header files generated using class-dump). // This workaround was "borrowed" from the Java Embedding Plugin (which // uses it for a different purpose). - if (mWindowType == eWindowType_popup) { + if (mWindowType == eWindowType_popup) [NSApp _removeWindowFromCache:mWindow]; - // Apple's focus ring APIs sometimes clip themselves when they draw under - // other windows. Redraw the window that was likely under the popup to - // get focus rings to draw correctly. Sometimes the window is not properly - // the parent of the popup, so we can't just tell the parent to redraw. - // We only have this problem on 10.4. See bug 417124. - if (!nsToolkit::OnLeopardOrLater()) { - NSWindow* keyWindow = [NSApp keyWindow]; - if (keyWindow) - [keyWindow display]; - NSWindow* mainWindow = [NSApp mainWindow]; - if (mainWindow && mainWindow != keyWindow) - [mainWindow display]; - } - } // it's very important to turn off mouse moved events when hiding a window, otherwise // the windows' tracking rects will interfere with each other. (bug 356528)