From 2990df182c64f22abe40715045c51fd0f9d590fa Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Wed, 31 Jan 2018 20:53:35 +0200 Subject: [PATCH] Backed out changeset f31755ef4145 (bug 1434618) for webdriver failures, e.g. webdriver/tests/actions/mouse_dblclick.py. CLOSED TREE --- dom/workers/RuntimeService.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index acd0b467aaa5..151b9e4c2ba0 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -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_WILL_SHUTDOWN_OBSERVER_ID, false); + rv = obs->AddObserver(this, NS_XPCOM_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_WILL_SHUTDOWN_OBSERVER_ID); + obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID); mObserved = false; } } @@ -2608,7 +2608,7 @@ RuntimeService::Observe(nsISupports* aSubject, const char* aTopic, { AssertIsOnMainThread(); - if (!strcmp(aTopic, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID)) { + if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) { Shutdown(); return NS_OK; }