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

Bug 448512 Crash on quit [@ XCloseDisplay] r=dbaron

Browse Source
This commit is contained in:
Ginn Chen 2009-03-10 14:27:41 +08:00
parent 79513278d9
commit 1ad5f79ebc
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/gtk2/nsScreenManagerGtk.cpp
View File

@ -107,7 +107,6 @@ root_window_event_filter(GdkXEvent *aGdkXEvent, GdkEvent *aGdkEvent,
nsScreenManagerGtk :: nsScreenManagerGtk ( )
: mXineramalib(nsnull)
, mXineramaIsActive(PR_FALSE)
, mRootWindow(nsnull)
{
// nothing else to do. I guess we could cache a bunch of information
@ -131,12 +130,6 @@ nsScreenManagerGtk :: ~nsScreenManagerGtk()
* We can't unload libXinerama.so.1 here because this will make
* the address of close_display() registered in X to be invalid and
* it will crash when XCloseDisplay() is called later. */
#ifdef MOZ_X11
if (mXineramalib && mXineramalib != SCREEN_MANAGER_LIBRARY_LOAD_FAILED &&
!mXineramaIsActive) {
PR_UnloadLibrary(mXineramalib);
}
#endif
}
@ -197,9 +190,6 @@ nsScreenManagerGtk :: Init()
if (_XnrmIsActive && _XnrmQueryScreens &&
_XnrmIsActive(GDK_DISPLAY())) {
screenInfo = _XnrmQueryScreens(GDK_DISPLAY(), &numScreens);
// remember for the destructor, if we are really working with Xinerama
mXineramaIsActive = numScreens > 0;
}
}

1
widget/src/gtk2/nsScreenManagerGtk.h
View File

@ -75,7 +75,6 @@ private:
nsCOMArray<nsIScreen> mCachedScreenArray;
PRLibrary *mXineramalib;
PRPackedBool mXineramaIsActive;
GdkWindow *mRootWindow;
#ifdef MOZ_X11