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

Bug 621386 - Clean up all ContentParent observers and listeners on actor destruction and xpcom-shutdown. r,a=bsmedberg

Browse Source 
--HG--
extra : rebase_source : 49f50817a9b8dcada7adb9bd770464b722dd39ae
This commit is contained in:
Josh Matthews 2010-12-26 14:27:50 -05:00
parent d36d0f9a5e
commit 0e2cf0db55
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/ipc/ContentParent.cpp
View File

@ -165,8 +165,23 @@ ContentParent::ActorDestroy(ActorDestroyReason why)
kungFuDeathGrip(static_cast<nsIThreadObserver*>(this));
nsCOMPtr<nsIObserverService>
obs(do_GetService("@mozilla.org/observer-service;1"));
if (obs)
if (obs) {
obs->RemoveObserver(static_cast<nsIObserver*>(this), "xpcom-shutdown");
obs->RemoveObserver(static_cast<nsIObserver*>(this), "memory-pressure");
obs->RemoveObserver(static_cast<nsIObserver*>(this),
NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC);
}
// remove the global remote preferences observers
nsCOMPtr<nsIPrefBranch2> prefs
(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefs) {
prefs->RemoveObserver("", this);
}
RecvRemoveGeolocationListener();
RecvRemoveAccelerometerListener();
nsCOMPtr<nsIThreadInternal>
threadInt(do_QueryInterface(NS_GetCurrentThread()));
if (threadInt)
@ -347,17 +362,6 @@ ContentParent::Observe(nsISupports* aSubject,
const PRUnichar* aData)
{
if (!strcmp(aTopic, "xpcom-shutdown") && mSubprocess) {
// remove the global remote preferences observers
nsCOMPtr<nsIPrefBranch2> prefs
(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefs) {
if (gSingleton) {
prefs->RemoveObserver("", this);
}
}
RecvRemoveGeolocationListener();
Close();
NS_ASSERTION(!mSubprocess, "Close should have nulled mSubprocess");
}