Bug 1824465 - Part 19: Make PSocketProcessBridge refcounted, r=necko-…

…reviewers,kershaw Differential Revision: https://phabricator.services.mozilla.com/D173734
iaxat · Apr 5, 2023 · 69e132b · 69e132b
1 parent 0132833
commit 69e132b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 36 deletions.
diff --git a/netwerk/ipc/PSocketProcessBridge.ipdl b/netwerk/ipc/PSocketProcessBridge.ipdl
@@ -17,7 +17,7 @@ namespace net {
   * content process and PSocketProcessBridgeParent lives in
   * socket process.
   */
-[ManualDealloc, NeedsOtherPid]
+[NeedsOtherPid]
 sync protocol PSocketProcessBridge
 {
 

diff --git a/netwerk/ipc/SocketProcessBridgeChild.cpp b/netwerk/ipc/SocketProcessBridgeChild.cpp
@@ -32,16 +32,24 @@ bool SocketProcessBridgeChild::Create(
     Endpoint<PSocketProcessBridgeChild>&& aEndpoint) {
   MOZ_ASSERT(NS_IsMainThread());
 
-  sSocketProcessBridgeChild =
-      new SocketProcessBridgeChild(std::move(aEndpoint));
-  if (sSocketProcessBridgeChild->Inited()) {
-    mozilla::ipc::BackgroundChild::InitSocketBridgeStarter(
-        sSocketProcessBridgeChild);
-    return true;
+  sSocketProcessBridgeChild = new SocketProcessBridgeChild();
+
+  if (!aEndpoint.Bind(sSocketProcessBridgeChild)) {
+    MOZ_ASSERT(false, "Bind failed!");
+    sSocketProcessBridgeChild = nullptr;
+    return false;
   }
 
-  sSocketProcessBridgeChild = nullptr;
-  return false;
+  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  if (os) {
+    os->AddObserver(sSocketProcessBridgeChild, "content-child-shutdown", false);
+  }
+
+  sSocketProcessBridgeChild->mSocketProcessPid = aEndpoint.OtherPid();
+
+  mozilla::ipc::BackgroundChild::InitSocketBridgeStarter(
+      sSocketProcessBridgeChild);
+  return true;
 }
 
 // static
@@ -115,23 +123,8 @@ SocketProcessBridgeChild::GetSocketProcessBridge() {
       });
 }
 
-SocketProcessBridgeChild::SocketProcessBridgeChild(
-    Endpoint<PSocketProcessBridgeChild>&& aEndpoint)
-    : mShuttingDown(false) {
+SocketProcessBridgeChild::SocketProcessBridgeChild() : mShuttingDown(false) {
   LOG(("CONSTRUCT SocketProcessBridgeChild::SocketProcessBridgeChild\n"));
-
-  mInited = aEndpoint.Bind(this);
-  if (!mInited) {
-    MOZ_ASSERT(false, "Bind failed!");
-    return;
-  }
-
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-  if (os) {
-    os->AddObserver(this, "content-child-shutdown", false);
-  }
-
-  mSocketProcessPid = aEndpoint.OtherPid();
 }
 
 SocketProcessBridgeChild::~SocketProcessBridgeChild() {

diff --git a/netwerk/ipc/SocketProcessBridgeChild.h b/netwerk/ipc/SocketProcessBridgeChild.h
@@ -31,19 +31,16 @@ class SocketProcessBridgeChild final : public PSocketProcessBridgeChild,
   void ActorDestroy(ActorDestroyReason aWhy) override;
   void DeferredDestroy();
   bool IsShuttingDown() const { return mShuttingDown; };
-  bool Inited() const { return mInited; };
   ProcessId SocketProcessPid() const { return mSocketProcessPid; };
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SocketProcessBridgeChild);
   static bool Create(Endpoint<PSocketProcessBridgeChild>&& aEndpoint);
-  explicit SocketProcessBridgeChild(
-      Endpoint<PSocketProcessBridgeChild>&& aEndpoint);
+  explicit SocketProcessBridgeChild();
   virtual ~SocketProcessBridgeChild();
 
   static StaticRefPtr<SocketProcessBridgeChild> sSocketProcessBridgeChild;
   bool mShuttingDown;
-  bool mInited = false;
   ProcessId mSocketProcessPid;
 };
 

diff --git a/netwerk/ipc/SocketProcessBridgeParent.cpp b/netwerk/ipc/SocketProcessBridgeParent.cpp
@@ -13,16 +13,13 @@
 namespace mozilla {
 namespace net {
 
-SocketProcessBridgeParent::SocketProcessBridgeParent(
-    ProcessId aId, Endpoint<PSocketProcessBridgeParent>&& aEndpoint)
+SocketProcessBridgeParent::SocketProcessBridgeParent(ProcessId aId)
     : mId(aId), mClosed(false) {
   LOG(
       ("CONSTRUCT SocketProcessBridgeParent::SocketProcessBridgeParent "
        "mId=%" PRIPID "\n",
        mId));
   MOZ_COUNT_CTOR(SocketProcessBridgeParent);
-  DebugOnly<bool> ok = aEndpoint.Bind(this);
-  MOZ_ASSERT(ok);
 }
 
 SocketProcessBridgeParent::~SocketProcessBridgeParent() {

diff --git a/netwerk/ipc/SocketProcessBridgeParent.h b/netwerk/ipc/SocketProcessBridgeParent.h
@@ -17,10 +17,9 @@ namespace net {
 // called to destroy this actor.
 class SocketProcessBridgeParent final : public PSocketProcessBridgeParent {
  public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SocketProcessBridgeParent)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SocketProcessBridgeParent, final)
 
-  explicit SocketProcessBridgeParent(
-      ProcessId aId, Endpoint<PSocketProcessBridgeParent>&& aEndpoint);
+  explicit SocketProcessBridgeParent(ProcessId aId);
 
   mozilla::ipc::IPCResult RecvTest();
   mozilla::ipc::IPCResult RecvInitBackground(