wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 940426 - part 2 - don't observe xpcom-shutdown in nsXULTemplateBuilder; r=bz

Browse Source
This commit is contained in:
Nathan Froyd 2013-11-19 20:04:15 -05:00
parent 2ec5630dff
commit 86ec57e686
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@ -102,6 +102,7 @@ nsXULTemplateBuilder::nsXULTemplateBuilder(void)
mTop(nullptr), mTop(nullptr),
mObservedDocument(nullptr) mObservedDocument(nullptr)
{ {
MOZ_COUNT_CTOR(nsXULTemplateBuilder);
} }
static PLDHashOperator static PLDHashOperator
@ -128,6 +129,8 @@ nsXULTemplateBuilder::~nsXULTemplateBuilder(void)
NS_IF_RELEASE(gScriptSecurityManager); NS_IF_RELEASE(gScriptSecurityManager);
NS_IF_RELEASE(gObserverService); NS_IF_RELEASE(gObserverService);
} }
MOZ_COUNT_DTOR(nsXULTemplateBuilder);
} }
@ -176,7 +179,6 @@ nsXULTemplateBuilder::StartObserving(nsIDocument* aDocument)
{ {
aDocument->AddObserver(this); aDocument->AddObserver(this);
mObservedDocument = aDocument; mObservedDocument = aDocument;
gObserverService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
gObserverService->AddObserver(this, DOM_WINDOW_DESTROYED_TOPIC, false); gObserverService->AddObserver(this, DOM_WINDOW_DESTROYED_TOPIC, false);
} }
@ -186,7 +188,6 @@ nsXULTemplateBuilder::StopObserving()
MOZ_ASSERT(mObservedDocument); MOZ_ASSERT(mObservedDocument);
mObservedDocument->RemoveObserver(this); mObservedDocument->RemoveObserver(this);
mObservedDocument = nullptr; mObservedDocument = nullptr;
gObserverService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
gObserverService->RemoveObserver(this, DOM_WINDOW_DESTROYED_TOPIC); gObserverService->RemoveObserver(this, DOM_WINDOW_DESTROYED_TOPIC);
} }
@ -1082,8 +1083,6 @@ nsXULTemplateBuilder::Observe(nsISupports* aSubject,
if (doc && doc == mObservedDocument) if (doc && doc == mObservedDocument)
NodeWillBeDestroyed(doc); NodeWillBeDestroyed(doc);
} }
} else if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
UninitTrue();
} }
return NS_OK; return NS_OK;
} }