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

Bug 1158404 - part 1 - DataChannelShutdown should instead observe xpcom-will-shutdown. r=jesup

Browse Source 
profile-change-net-teardown does not happen in the child process, so this ends up leaking.
This commit is contained in:
Andrew McCreight 2015-10-20 10:47:00 +02:00
parent da38a008ad
commit 62280abb0f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/sctp/datachannel/DataChannel.cpp
View File

@ -104,7 +104,7 @@ public:
return;
nsresult rv = observerService->AddObserver(this,
"profile-change-net-teardown",
"xpcom-will-shutdown",
false);
MOZ_ASSERT(rv == NS_OK);
(void) rv;
@ -116,13 +116,13 @@ private:
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();
if (observerService)
observerService->RemoveObserver(this, "profile-change-net-teardown");
observerService->RemoveObserver(this, "xpcom-will-shutdown");
}
public:
NS_IMETHODIMP Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) override {
if (strcmp(aTopic, "profile-change-net-teardown") == 0) {
if (strcmp(aTopic, "xpcom-will-shutdown") == 0) {
LOG(("Shutting down SCTP"));
if (sctp_initialized) {
usrsctp_finish();
@ -134,7 +134,7 @@ public:
return NS_ERROR_FAILURE;
nsresult rv = observerService->RemoveObserver(this,
"profile-change-net-teardown");
"xpcom-will-shutdown");
MOZ_ASSERT(rv == NS_OK);
(void) rv;