Bug 1570369 - Part 7: Use IPDL refcounted for PFileSystemRequest, r=baku

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

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

dom/filesystem/FileSystemRequestParent.h

@@ -17,7 +17,7 @@ class FileSystemParams;
 class FileSystemTaskParentBase;
 
 class FileSystemRequestParent final : public PFileSystemRequestParent {
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FileSystemRequestParent)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FileSystemRequestParent, final)
 
  public:
   FileSystemRequestParent();

dom/filesystem/FileSystemTaskBase.cpp

@@ -139,11 +139,6 @@ void FileSystemTaskChildBase::Start() {
     return;
   }
 
-  // Retain a reference so the task object isn't deleted without IPDL's
-  // knowledge. The reference will be released by
-  // mozilla::ipc::BackgroundChildImpl::DeallocPFileSystemRequestChild.
-  NS_ADDREF_THIS();
-
   if (NS_IsMainThread()) {
     nsIEventTarget* target = mGlobalObject->EventTargetFor(TaskCategory::Other);
     MOZ_ASSERT(target);

dom/filesystem/FileSystemTaskBase.h

@@ -102,7 +102,7 @@ class FileSystemTaskChildBase : public PFileSystemRequestChild {
   friend class PFileSystemRequestChild;
 
  public:
-  NS_INLINE_DECL_REFCOUNTING(FileSystemTaskChildBase)
+  NS_INLINE_DECL_REFCOUNTING(FileSystemTaskChildBase, final)
 
   /*
    * Start the task. It will dispatch all the information to the parent process,

dom/filesystem/PFileSystemRequest.ipdl

@@ -66,7 +66,7 @@ union FileSystemResponseValue
   FileSystemErrorResponse;
 };
 
-protocol PFileSystemRequest
+refcounted protocol PFileSystemRequest
 {
   manager PBackground;
 

ipc/glue/BackgroundChildImpl.cpp

@@ -631,21 +631,6 @@ bool BackgroundChildImpl::DeallocPMIDIManagerChild(PMIDIManagerChild* aActor) {
   return true;
 }
 
-dom::PFileSystemRequestChild* BackgroundChildImpl::AllocPFileSystemRequestChild(
-    const FileSystemParams& aParams) {
-  MOZ_CRASH("Should never get here!");
-  return nullptr;
-}
-
-bool BackgroundChildImpl::DeallocPFileSystemRequestChild(
-    PFileSystemRequestChild* aActor) {
-  // The reference is increased in FileSystemTaskBase::Start of
-  // FileSystemTaskBase.cpp. We should decrease it after IPC.
-  RefPtr<dom::FileSystemTaskChildBase> child =
-      dont_AddRef(static_cast<dom::FileSystemTaskChildBase*>(aActor));
-  return true;
-}
-
 // Gamepad API Background IPC
 dom::PGamepadEventChannelChild*
 BackgroundChildImpl::AllocPGamepadEventChannelChild() {

ipc/glue/BackgroundChildImpl.h

@@ -225,12 +225,6 @@ class BackgroundChildImpl : public PBackgroundChild {
 
   virtual bool DeallocPQuotaChild(PQuotaChild* aActor) override;
 
-  virtual PFileSystemRequestChild* AllocPFileSystemRequestChild(
-      const FileSystemParams&) override;
-
-  virtual bool DeallocPFileSystemRequestChild(
-      PFileSystemRequestChild*) override;
-
   // Gamepad API Background IPC
   virtual PGamepadEventChannelChild* AllocPGamepadEventChannelChild() override;
 

ipc/glue/BackgroundParentImpl.cpp

@@ -1027,7 +1027,7 @@ mozilla::ipc::IPCResult BackgroundParentImpl::RecvShutdownQuotaManager() {
   return IPC_OK();
 }
 
-dom::PFileSystemRequestParent*
+already_AddRefed<dom::PFileSystemRequestParent>
 BackgroundParentImpl::AllocPFileSystemRequestParent(
     const FileSystemParams& aParams) {
   AssertIsInMainOrSocketProcess();
@@ -1039,7 +1039,7 @@ BackgroundParentImpl::AllocPFileSystemRequestParent(
     return nullptr;
   }
 
-  return result.forget().take();
+  return result.forget();
 }
 
 mozilla::ipc::IPCResult BackgroundParentImpl::RecvPFileSystemRequestConstructor(
@@ -1048,16 +1048,6 @@ mozilla::ipc::IPCResult BackgroundParentImpl::RecvPFileSystemRequestConstructor(
   return IPC_OK();
 }
 
-bool BackgroundParentImpl::DeallocPFileSystemRequestParent(
-    PFileSystemRequestParent* aDoomed) {
-  AssertIsInMainOrSocketProcess();
-  AssertIsOnBackgroundThread();
-
-  RefPtr<FileSystemRequestParent> parent =
-      dont_AddRef(static_cast<FileSystemRequestParent*>(aDoomed));
-  return true;
-}
-
 // Gamepad API Background IPC
 dom::PGamepadEventChannelParent*
 BackgroundParentImpl::AllocPGamepadEventChannelParent() {

ipc/glue/BackgroundParentImpl.h

@@ -282,15 +282,12 @@ class BackgroundParentImpl : public PBackgroundParent {
 
   virtual mozilla::ipc::IPCResult RecvShutdownQuotaManager() override;
 
-  virtual PFileSystemRequestParent* AllocPFileSystemRequestParent(
-      const FileSystemParams&) override;
+  virtual already_AddRefed<PFileSystemRequestParent>
+  AllocPFileSystemRequestParent(const FileSystemParams&) override;
 
   virtual mozilla::ipc::IPCResult RecvPFileSystemRequestConstructor(
       PFileSystemRequestParent* actor, const FileSystemParams& params) override;
 
-  virtual bool DeallocPFileSystemRequestParent(
-      PFileSystemRequestParent*) override;
-
   // Gamepad API Background IPC
   virtual PGamepadEventChannelParent* AllocPGamepadEventChannelParent()
       override;