Bug 1961460 - Remove the assertion for target thread in RemoteWorkerDebuggerManagerChild::Constructor. r=dom-worker-reviewers,jstutte

RemoteWorkerService::InitializeOnTargetThread could race with its shutdown
So we can not use sRemoteWorkerService for thread correctness checking in RemoteWorkerDebuggerManagerChild creation during the initialization.

This patch remove the assertions in the RemoteWorkerDebuggerManagerChild constructor and also moving the RemoteWorkerDebuggerManagerChild creation into RemoteWorkerService::InitializeOnTargetThread. RemoteWorkerService::InitializeOnTargetThread provides the thread correctness checking by using its mThread.

Differential Revision: https://phabricator.services.mozilla.com/D247043

dom/workers/WorkerPrivate.cpp

@@ -3160,7 +3160,7 @@ already_AddRefed<WorkerPrivate> WorkerPrivate::Constructor(
 
   // Create remote debugger endpoint here for child binding in
   // WorkerThreadPrimaryRunnable
-  worker->CreateRemoteDebuggerEndpoints();
+  // worker->CreateRemoteDebuggerEndpoints();
 
   if (!runtimeService->RegisterWorker(*worker)) {
     aRv.Throw(NS_ERROR_UNEXPECTED);

dom/workers/remoteworkers/RemoteWorkerDebuggerManagerChild.cpp

@@ -7,11 +7,7 @@
 
 namespace mozilla::dom {
 
-RemoteWorkerDebuggerManagerChild::RemoteWorkerDebuggerManagerChild() {
+RemoteWorkerDebuggerManagerChild::RemoteWorkerDebuggerManagerChild() {}
-  MOZ_ASSERT_DEBUG_OR_FUZZING(
-      RemoteWorkerService::Thread() &&
-      RemoteWorkerService::Thread()->IsOnCurrentThread());
-}
 
 RemoteWorkerDebuggerManagerChild::~RemoteWorkerDebuggerManagerChild() {}
 

dom/workers/remoteworkers/RemoteWorkerService.cpp

@@ -275,11 +275,8 @@ nsresult RemoteWorkerService::InitializeOnMainThread(
       "InitializeThread",
       [self, endpoint = std::move(aEndpoint),
        debuggerChildEp = std::move(aDebuggerChildEp)]() mutable {
-        self->InitializeOnTargetThread(std::move(endpoint));
+        self->InitializeOnTargetThread(std::move(endpoint),
-
+                                       std::move(debuggerChildEp));
-        self->mDebuggerManagerChild =
-            MakeRefPtr<RemoteWorkerDebuggerManagerChild>();
-        debuggerChildEp.Bind(self->mDebuggerManagerChild);
       });
 
   rv = mThread->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
@@ -298,18 +295,26 @@ RemoteWorkerService::RemoteWorkerService()
 RemoteWorkerService::~RemoteWorkerService() = default;
 
 void RemoteWorkerService::InitializeOnTargetThread(
-    mozilla::ipc::Endpoint<PRemoteWorkerServiceChild> aEndpoint) {
+    mozilla::ipc::Endpoint<PRemoteWorkerServiceChild> aEndpoint,
+    mozilla::ipc::Endpoint<PRemoteWorkerDebuggerManagerChild>
+        aDebuggerMgrEndpoint) {
   MOZ_ASSERT(mThread);
   MOZ_ASSERT(mThread->IsOnCurrentThread());
 
+  RefPtr<RemoteWorkerDebuggerManagerChild> debuggerManagerActor =
+      MakeRefPtr<RemoteWorkerDebuggerManagerChild>();
+  if (NS_WARN_IF(!aDebuggerMgrEndpoint.Bind(debuggerManagerActor))) {
+    return;
+  }
+
   RefPtr<RemoteWorkerServiceChild> serviceActor =
       MakeAndAddRef<RemoteWorkerServiceChild>();
   if (NS_WARN_IF(!aEndpoint.Bind(serviceActor))) {
     return;
   }
 
-  // Now we are ready!
+  mDebuggerManagerChild = std::move(debuggerManagerActor);
-  mActor = serviceActor;
+  mActor = std::move(serviceActor);
 }
 
 void RemoteWorkerService::CloseActorOnTargetThread() {
@@ -322,6 +327,10 @@ void RemoteWorkerService::CloseActorOnTargetThread() {
     mActor->Close();
     mActor = nullptr;
   }
+  if (mDebuggerManagerChild) {
+    mDebuggerManagerChild->Close();
+    mDebuggerManagerChild = nullptr;
+  }
 }
 
 NS_IMETHODIMP

dom/workers/remoteworkers/RemoteWorkerService.h

@@ -111,7 +111,9 @@ class RemoteWorkerService final : public nsIObserver {
           aDebuggerChildEp);
 
   void InitializeOnTargetThread(
-      mozilla::ipc::Endpoint<PRemoteWorkerServiceChild> aEndpoint);
+      mozilla::ipc::Endpoint<PRemoteWorkerServiceChild> aEndpoint,
+      mozilla::ipc::Endpoint<PRemoteWorkerDebuggerManagerChild>
+          aDebuggerMgrEndpoint);
 
   void CloseActorOnTargetThread();