Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1189132 - Skip unmap during window destruction on GTK, working around talos hang with GL layers. r=karlt

Browse Source
This commit is contained in:
Andrew Comminos 2015-08-26 19:48:07 -04:00
parent f878f77b97
commit d7abfb9d4d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xpfe/appshell/nsXULWindow.cpp
View File

@ -441,8 +441,13 @@ NS_IMETHODIMP nsXULWindow::Destroy()
// destroyed window. This is especially necessary when the eldest window // destroyed window. This is especially necessary when the eldest window
// in a stack of modal windows is destroyed first. It happens. // in a stack of modal windows is destroyed first. It happens.
ExitModalLoop(NS_OK); ExitModalLoop(NS_OK);
// XXX: Skip unmapping the window on Linux due to GLX hangs on the compositor
// thread with NVIDIA driver 310.32. We don't need to worry about user
// interactions with destroyed windows on X11 either.
#ifndef MOZ_WIDGET_GTK
if (mWindow) if (mWindow)
mWindow->Show(false); mWindow->Show(false);
#endif
#if defined(XP_WIN) #if defined(XP_WIN)
// We need to explicitly set the focus on Windows, but // We need to explicitly set the focus on Windows, but