Bug 1559919 - Finish the WorkerHolder cleanup - part 4 - IPCWorkerRef in ServiceWorkerContainerChild, r=asuth

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

--HG--
extra : moz-landing-system : lando

dom/serviceworkers/RemoteServiceWorkerContainerImpl.cpp

@@ -199,22 +199,12 @@ RemoteServiceWorkerContainerImpl::RemoteServiceWorkerContainerImpl()
     return;
   }
 
-  RefPtr<WorkerHolderToken> workerHolderToken;
+  ServiceWorkerContainerChild* actor = ServiceWorkerContainerChild::Create();
-  if (!NS_IsMainThread()) {
+  if (NS_WARN_IF(!actor)) {
-    WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
+    Shutdown();
-    MOZ_DIAGNOSTIC_ASSERT(workerPrivate);
+    return;
-
-    workerHolderToken = WorkerHolderToken::Create(
-        workerPrivate, Canceling, WorkerHolderToken::AllowIdleShutdownStart);
-
-    if (NS_WARN_IF(!workerHolderToken)) {
-      Shutdown();
-      return;
-    }
   }
 
-  ServiceWorkerContainerChild* actor =
-      new ServiceWorkerContainerChild(workerHolderToken);
   PServiceWorkerContainerChild* sentActor =
       parentActor->SendPServiceWorkerContainerConstructor(actor);
   if (NS_WARN_IF(!sentActor)) {

dom/serviceworkers/ServiceWorkerContainerChild.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/PServiceWorkerContainerChild.h"
+#include "mozilla/dom/WorkerRef.h"
 
 #include "RemoteServiceWorkerContainerImpl.h"
 
@@ -12,10 +13,7 @@ namespace mozilla {
 namespace dom {
 
 void ServiceWorkerContainerChild::ActorDestroy(ActorDestroyReason aReason) {
-  if (mWorkerHolderToken) {
+  mIPCWorkerRef = nullptr;
-    mWorkerHolderToken->RemoveListener(this);
-    mWorkerHolderToken = nullptr;
-  }
 
   if (mOwner) {
     mOwner->RevokeActor(this);
@@ -23,18 +21,32 @@ void ServiceWorkerContainerChild::ActorDestroy(ActorDestroyReason aReason) {
   }
 }
 
-void ServiceWorkerContainerChild::WorkerShuttingDown() { MaybeStartTeardown(); }
+// static
+ServiceWorkerContainerChild* ServiceWorkerContainerChild::Create() {
+  ServiceWorkerContainerChild* actor = new ServiceWorkerContainerChild();
 
-ServiceWorkerContainerChild::ServiceWorkerContainerChild(
+  if (!NS_IsMainThread()) {
-    WorkerHolderToken* aWorkerHolderToken)
+    WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
-    : mWorkerHolderToken(aWorkerHolderToken),
+    MOZ_DIAGNOSTIC_ASSERT(workerPrivate);
-      mOwner(nullptr),
+
-      mTeardownStarted(false) {
+    RefPtr<IPCWorkerRefHelper<ServiceWorkerContainerChild>> helper =
-  if (mWorkerHolderToken) {
+        new IPCWorkerRefHelper<ServiceWorkerContainerChild>(actor);
-    mWorkerHolderToken->AddListener(this);
+
+    actor->mIPCWorkerRef = IPCWorkerRef::Create(
+        workerPrivate, "ServiceWorkerContainerChild",
+        [helper] { helper->Actor()->MaybeStartTeardown(); });
+    if (NS_WARN_IF(!actor->mIPCWorkerRef)) {
+      delete actor;
+      return nullptr;
+    }
   }
+
+  return actor;
 }
 
+ServiceWorkerContainerChild::ServiceWorkerContainerChild()
+    : mOwner(nullptr), mTeardownStarted(false) {}
+
 void ServiceWorkerContainerChild::SetOwner(
     RemoteServiceWorkerContainerImpl* aOwner) {
   MOZ_DIAGNOSTIC_ASSERT(!mOwner);

dom/serviceworkers/ServiceWorkerContainerChild.h

@@ -8,25 +8,25 @@
 #define mozilla_dom_serviceworkercontainerchild_h__
 
 #include "mozilla/dom/PServiceWorkerContainerChild.h"
-#include "mozilla/dom/WorkerHolderToken.h"
 
 namespace mozilla {
 namespace dom {
 
-class ServiceWorkerContainerChild final : public PServiceWorkerContainerChild,
+class IPCWorkerRef;
-                                          public WorkerHolderToken::Listener {
+
-  RefPtr<WorkerHolderToken> mWorkerHolderToken;
+class ServiceWorkerContainerChild final : public PServiceWorkerContainerChild {
+  RefPtr<IPCWorkerRef> mIPCWorkerRef;
   RemoteServiceWorkerContainerImpl* mOwner;
   bool mTeardownStarted;
 
+  ServiceWorkerContainerChild();
+
   // PServiceWorkerContainerChild
   void ActorDestroy(ActorDestroyReason aReason) override;
 
-  // WorkerHolderToken::Listener
-  void WorkerShuttingDown() override;
-
  public:
-  explicit ServiceWorkerContainerChild(WorkerHolderToken* aWorkerHolderToken);
+  static ServiceWorkerContainerChild* Create();
+
   ~ServiceWorkerContainerChild() = default;
 
   void SetOwner(RemoteServiceWorkerContainerImpl* aOwner);