Backed out changeset 64ca4238a420 (bug 1454633) for mochitest failures on dom/workers/test/test_WorkerDebugger.xul. CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Tue, 17 Apr 2018 17:41:02 +0300
changeset 467651 2eb8596e5602eeed82d6e7033eed210c45ce6136
parent 467650 dcb09671d01369f302845785b1e83bb5f16d9f02
child 467652 d6eb5597d7447ee84aced9345bd4d13175c7e671
child 467683 d56a387c8b3645673cac34673eb63a585eb6d762
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1454633
milestone61.0a1
backs out64ca4238a4208fe6283806a92d74e50067900309
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 64ca4238a420 (bug 1454633) for mochitest failures on dom/workers/test/test_WorkerDebugger.xul. CLOSED TREE
dom/clients/api/Client.cpp
dom/clients/api/ClientDOMUtil.h
dom/clients/manager/ClientManager.cpp
--- a/dom/clients/api/Client.cpp
+++ b/dom/clients/api/Client.cpp
@@ -171,17 +171,17 @@ Client::Focus(ErrorResult& aRv)
     outerPromise->MaybeReject(NS_ERROR_DOM_INVALID_ACCESS_ERR);
     return outerPromise.forget();
   }
 
   // Hold the worker thread alive while we perform the async operation
   // and also avoid invoking callbacks if the worker starts shutting
   // down.
   RefPtr<WorkerHolderToken> token =
-    WorkerHolderToken::Create(GetCurrentThreadWorkerPrivate(), Terminating);
+    WorkerHolderToken::Create(GetCurrentThreadWorkerPrivate(), Closing);
 
   EnsureHandle();
   RefPtr<ClientStatePromise> innerPromise = mHandle->Focus();
   RefPtr<Client> self = this;
 
   innerPromise->Then(mGlobal->EventTargetFor(TaskCategory::Other), __func__,
     [self, token, outerPromise] (const ClientState& aResult) {
       if (token->IsShuttingDown()) {
--- a/dom/clients/api/ClientDOMUtil.h
+++ b/dom/clients/api/ClientDOMUtil.h
@@ -22,17 +22,17 @@ namespace dom {
 template<typename Func, typename Arg, typename Resolve, typename Reject>
 void
 StartClientManagerOp(Func aFunc, const Arg& aArg, nsISerialEventTarget* aTarget,
                      Resolve aResolve, Reject aReject)
 {
   RefPtr<WorkerHolderToken> token;
   if (!NS_IsMainThread()) {
     token = WorkerHolderToken::Create(GetCurrentThreadWorkerPrivate(),
-                                      WorkerStatus::Terminating);
+                                      WorkerStatus::Closing);
   }
 
   RefPtr<ClientOpPromise> promise = aFunc(aArg, aTarget);
   promise->Then(aTarget, __func__,
     [aResolve, token](const ClientOpResult& aResult) {
       if (token && token->IsShuttingDown()) {
         return;
       }
--- a/dom/clients/manager/ClientManager.cpp
+++ b/dom/clients/manager/ClientManager.cpp
@@ -41,17 +41,17 @@ ClientManager::ClientManager()
   }
 
   RefPtr<WorkerHolderToken> workerHolderToken;
   if (!NS_IsMainThread()) {
     WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
     MOZ_DIAGNOSTIC_ASSERT(workerPrivate);
 
     workerHolderToken =
-      WorkerHolderToken::Create(workerPrivate, Terminating,
+      WorkerHolderToken::Create(workerPrivate, Closing,
                                 WorkerHolderToken::AllowIdleShutdownStart);
     if (NS_WARN_IF(!workerHolderToken)) {
       Shutdown();
       return;
     }
   }
 
   ClientManagerChild* actor = new ClientManagerChild(workerHolderToken);