Bug 1775784 - Make PRemoteWorker refcounted instead of ManualDealloc.…

… r=dom-worker-reviewers,smaug

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

dom/workers/remoteworkers/PRemoteWorker.ipdl

@@ -56,7 +56,6 @@ union RemoteWorkerOp {
 // This protocol is used to make a remote worker controllable from the parent
 // process. The parent process will receive operations from the
 // PRemoteWorkerController protocol.
-[ManualDealloc]
 protocol PRemoteWorker
 {
   manager PBackground;

dom/workers/remoteworkers/RemoteWorkerChild.h

@@ -47,13 +47,13 @@ class RemoteWorkerChild final
   friend class PRemoteWorkerChild;
   friend class ServiceWorkerOp;
 
+  ~RemoteWorkerChild();
+
  public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(RemoteWorkerChild)
+  NS_INLINE_DECL_REFCOUNTING(RemoteWorkerChild, final)
 
   explicit RemoteWorkerChild(const RemoteWorkerData& aData);
 
-  ~RemoteWorkerChild();
-
   nsISerialEventTarget* GetOwningEventTarget() const;
 
   void ExecWorker(const RemoteWorkerData& aData);

dom/workers/remoteworkers/RemoteWorkerManager.cpp

@@ -469,9 +469,9 @@ void RemoteWorkerManager::LaunchInternal(
         SchedulerGroup::Dispatch(TaskCategory::Other, r.forget()));
   }
 
-  RemoteWorkerParent* workerActor = static_cast<RemoteWorkerParent*>(
-      aTargetActor->Manager()->SendPRemoteWorkerConstructor(aData));
-  if (NS_WARN_IF(!workerActor)) {
+  RefPtr<RemoteWorkerParent> workerActor = MakeAndAddRef<RemoteWorkerParent>();
+  if (!aTargetActor->Manager()->SendPRemoteWorkerConstructor(workerActor,
+                                                             aData)) {
     AsyncCreationFailed(aController);
     return;
   }

dom/workers/remoteworkers/RemoteWorkerParent.h

@@ -22,7 +22,7 @@ class RemoteWorkerParent final : public PRemoteWorkerParent {
   friend class PRemoteWorkerParent;
 
  public:
-  NS_INLINE_DECL_REFCOUNTING(RemoteWorkerParent)
+  NS_INLINE_DECL_REFCOUNTING(RemoteWorkerParent, override);
 
   RemoteWorkerParent();
 

ipc/glue/BackgroundChildImpl.cpp

@@ -70,9 +70,11 @@ namespace mozilla::ipc {
 using mozilla::dom::UDPSocketChild;
 using mozilla::net::PUDPSocketChild;
 
+using mozilla::dom::PRemoteWorkerChild;
 using mozilla::dom::PServiceWorkerChild;
 using mozilla::dom::PServiceWorkerContainerChild;
 using mozilla::dom::PServiceWorkerRegistrationChild;
+using mozilla::dom::RemoteWorkerChild;
 using mozilla::dom::StorageDBChild;
 using mozilla::dom::cache::PCacheChild;
 using mozilla::dom::cache::PCacheStreamControlChild;
@@ -280,10 +282,9 @@ bool BackgroundChildImpl::DeallocPBackgroundStorageChild(
   return true;
 }
 
-dom::PRemoteWorkerChild* BackgroundChildImpl::AllocPRemoteWorkerChild(
-    const RemoteWorkerData& aData) {
-  RefPtr<dom::RemoteWorkerChild> agent = new dom::RemoteWorkerChild(aData);
-  return agent.forget().take();
+already_AddRefed<PRemoteWorkerChild>
+BackgroundChildImpl::AllocPRemoteWorkerChild(const RemoteWorkerData& aData) {
+  return MakeAndAddRef<RemoteWorkerChild>(aData);
 }
 
 IPCResult BackgroundChildImpl::RecvPRemoteWorkerConstructor(
@@ -293,13 +294,6 @@ IPCResult BackgroundChildImpl::RecvPRemoteWorkerConstructor(
   return IPC_OK();
 }
 
-bool BackgroundChildImpl::DeallocPRemoteWorkerChild(
-    dom::PRemoteWorkerChild* aActor) {
-  RefPtr<dom::RemoteWorkerChild> actor =
-      dont_AddRef(static_cast<dom::RemoteWorkerChild*>(aActor));
-  return true;
-}
-
 dom::PRemoteWorkerControllerChild*
 BackgroundChildImpl::AllocPRemoteWorkerControllerChild(
     const dom::RemoteWorkerData& aRemoteWorkerData) {

ipc/glue/BackgroundChildImpl.h

@@ -116,15 +116,12 @@ class BackgroundChildImpl : public PBackgroundChild {
 
   virtual bool DeallocPFileCreatorChild(PFileCreatorChild* aActor) override;
 
-  virtual mozilla::dom::PRemoteWorkerChild* AllocPRemoteWorkerChild(
+  already_AddRefed<mozilla::dom::PRemoteWorkerChild> AllocPRemoteWorkerChild(
       const RemoteWorkerData& aData) override;
 
   virtual mozilla::ipc::IPCResult RecvPRemoteWorkerConstructor(
       PRemoteWorkerChild* aActor, const RemoteWorkerData& aData) override;
 
-  virtual bool DeallocPRemoteWorkerChild(
-      mozilla::dom::PRemoteWorkerChild* aActor) override;
-
   virtual mozilla::dom::PRemoteWorkerControllerChild*
   AllocPRemoteWorkerControllerChild(
       const mozilla::dom::RemoteWorkerData& aRemoteWorkerData) override;

ipc/glue/BackgroundParentImpl.cpp

@@ -34,7 +34,6 @@
 #include "mozilla/dom/PGamepadEventChannelParent.h"
 #include "mozilla/dom/PGamepadTestChannelParent.h"
 #include "mozilla/dom/RemoteWorkerControllerParent.h"
-#include "mozilla/dom/RemoteWorkerParent.h"
 #include "mozilla/dom/RemoteWorkerServiceParent.h"
 #include "mozilla/dom/ReportingHeader.h"
 #include "mozilla/dom/ServiceWorkerActors.h"
@@ -514,19 +513,6 @@ BackgroundParentImpl::AllocPIdleSchedulerParent() {
   return actor.forget();
 }
 
-mozilla::dom::PRemoteWorkerParent*
-BackgroundParentImpl::AllocPRemoteWorkerParent(const RemoteWorkerData& aData) {
-  RefPtr<dom::RemoteWorkerParent> agent = new dom::RemoteWorkerParent();
-  return agent.forget().take();
-}
-
-bool BackgroundParentImpl::DeallocPRemoteWorkerParent(
-    mozilla::dom::PRemoteWorkerParent* aActor) {
-  RefPtr<mozilla::dom::RemoteWorkerParent> actor =
-      dont_AddRef(static_cast<mozilla::dom::RemoteWorkerParent*>(aActor));
-  return true;
-}
-
 dom::PRemoteWorkerControllerParent*
 BackgroundParentImpl::AllocPRemoteWorkerControllerParent(
     const dom::RemoteWorkerData& aRemoteWorkerData) {

ipc/glue/BackgroundParentImpl.h

@@ -164,11 +164,6 @@ class BackgroundParentImpl : public PBackgroundParent {
 
   bool DeallocPFileCreatorParent(PFileCreatorParent* aActor) override;
 
-  mozilla::dom::PRemoteWorkerParent* AllocPRemoteWorkerParent(
-      const RemoteWorkerData& aData) override;
-
-  bool DeallocPRemoteWorkerParent(PRemoteWorkerParent* aActor) override;
-
   mozilla::dom::PRemoteWorkerControllerParent*
   AllocPRemoteWorkerControllerParent(
       const mozilla::dom::RemoteWorkerData& aRemoteWorkerData) override;