зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset f31755ef4145 (bug 1434618) for webdriver failures, e.g. webdriver/tests/actions/mouse_dblclick.py. CLOSED TREE
This commit is contained in:
Родитель
07250813a5
Коммит
2990df182c
|
@ -1749,7 +1749,7 @@ RuntimeService::Init()
|
||||||
rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, false);
|
rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID, false);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
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);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
mObserved = true;
|
mObserved = true;
|
||||||
|
@ -2131,7 +2131,7 @@ RuntimeService::Cleanup()
|
||||||
NS_WARNING("Failed to unregister for offline notification event!");
|
NS_WARNING("Failed to unregister for offline notification event!");
|
||||||
}
|
}
|
||||||
obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID);
|
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;
|
mObserved = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2608,7 +2608,7 @@ RuntimeService::Observe(nsISupports* aSubject, const char* aTopic,
|
||||||
{
|
{
|
||||||
AssertIsOnMainThread();
|
AssertIsOnMainThread();
|
||||||
|
|
||||||
if (!strcmp(aTopic, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID)) {
|
if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
|
||||||
Shutdown();
|
Shutdown();
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче