Bug 1434618 - Worker shutdown should start at xpcom-will-shutdown notification, r=smaug

This commit is contained in:
Andrea Marchesini 2018-01-31 16:43:24 +01:00
parent a94ca8b3d3
commit f8497b97e2

View File

@ -1749,7 +1749,7 @@ RuntimeService::Init()
rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, false);
NS_ENSURE_SUCCESS(rv, rv);
rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
rv = obs->AddObserver(this, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID, false);
NS_ENSURE_SUCCESS(rv, rv);
mObserved = true;
@ -2131,7 +2131,7 @@ RuntimeService::Cleanup()
NS_WARNING("Failed to unregister for offline notification event!");
}
obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID);
obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
obs->RemoveObserver(this, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID);
mObserved = false;
}
}
@ -2608,7 +2608,7 @@ RuntimeService::Observe(nsISupports* aSubject, const char* aTopic,
{
AssertIsOnMainThread();
if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
if (!strcmp(aTopic, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID)) {
Shutdown();
return NS_OK;
}