Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 01:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix leak of window group created by gtk_window_group_new by reference counting window groups. b=398940 r+sr+a1.9=roc

Browse Source
This commit is contained in:
dbaron@dbaron.org 2007-10-07 22:02:38 -07:00
parent c53e7acdd2
commit c86e28a556
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/src/gtk2/nsWindow.cpp
View File

@ -462,11 +462,10 @@ nsWindow::Destroy(void)
gPluginFocusWindow->LoseNonXEmbedPluginFocus();
}
// Remove our reference to the window group. If there was a window
// group destroying the widget will have automatically unreferenced
// the group, destroying it if necessary. And, if we're a child
// window this isn't going to harm anything.
mWindowGroup = nsnull;
if (mWindowGroup) {
g_object_unref(G_OBJECT(mWindowGroup));
mWindowGroup = nsnull;
}
// Destroy thebes surface now. Badness can happen if we destroy
// the surface after its X Window.
@ -2768,6 +2767,7 @@ nsWindow::NativeCreate(nsIWidget *aParent,
NS_ASSERTION(aInitData->mWindowType != eWindowType_popup ||
!aParent, "Popups should not be hooked into nsIWidget hierarchy");
NS_ASSERTION(!mWindowGroup, "already have window group (leaking it)");
// initialize all the common bits of this class
BaseCreate(baseParent, aRect, aHandleEventFunction, aContext,
@ -2898,6 +2898,7 @@ nsWindow::NativeCreate(nsIWidget *aParent,
GTK_WINDOW(mShell));
// store this in case any children are created
mWindowGroup = parentnsWindow->mWindowGroup;
g_object_ref(G_OBJECT(mWindowGroup));
LOG(("adding window %p to group %p\n",
(void *)mShell, (void *)mWindowGroup));
}
@ -2916,6 +2917,7 @@ nsWindow::NativeCreate(nsIWidget *aParent,
gtk_window_group_add_window(topLevelParent->group,
GTK_WINDOW(mShell));
mWindowGroup = topLevelParent->group;
g_object_ref(G_OBJECT(mWindowGroup));
}
}
}