Bug 1576714 - Part 2: Remove mIPCOpen from PBrowserBridge actors, r=kmag

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

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

dom/ipc/BrowserBridgeChild.cpp

@@ -35,7 +35,6 @@ BrowserBridgeChild::BrowserBridgeChild(nsFrameLoader* aFrameLoader,
                                        TabId aId)
     : mId{aId},
       mLayersId{0},
-      mIPCOpen(false),
       mFrameLoader(aFrameLoader),
       mBrowsingContext(aBrowsingContext) {}
 
@@ -48,9 +47,6 @@ BrowserBridgeChild::~BrowserBridgeChild() {
 }
 
 already_AddRefed<BrowserBridgeHost> BrowserBridgeChild::FinishInit() {
-  MOZ_ASSERT(!mIPCOpen);
-  mIPCOpen = true;
-
   RefPtr<Element> owner = mFrameLoader->GetOwnerContent();
   nsCOMPtr<nsIDocShell> docShell = do_GetInterface(owner->GetOwnerGlobal());
   MOZ_DIAGNOSTIC_ASSERT(docShell);
@@ -246,8 +242,6 @@ mozilla::ipc::IPCResult BrowserBridgeChild::RecvSubFrameCrashed(
 }
 
 void BrowserBridgeChild::ActorDestroy(ActorDestroyReason aWhy) {
-  mIPCOpen = false;
-
   // Ensure we unblock our document's 'load' event (in case the OOP-iframe has
   // been removed before it finished loading, or its subprocess crashed):
   UnblockOwnerDocsLoadEvent();

dom/ipc/BrowserBridgeChild.h

@@ -33,7 +33,7 @@ class BrowserBridgeChild : public PBrowserBridgeChild {
   NS_INLINE_DECL_REFCOUNTING(BrowserBridgeChild, final);
 
   BrowserChild* Manager() {
-    MOZ_ASSERT(mIPCOpen);
+    MOZ_ASSERT(CanSend());
     return static_cast<BrowserChild*>(PBrowserBridgeChild::Manager());
   }
 
@@ -106,7 +106,6 @@ class BrowserBridgeChild : public PBrowserBridgeChild {
 
   TabId mId;
   LayersId mLayersId;
-  bool mIPCOpen;
   bool mHadInitialLoad = false;
   RefPtr<nsFrameLoader> mFrameLoader;
   RefPtr<BrowsingContext> mBrowsingContext;

dom/ipc/BrowserBridgeParent.cpp

@@ -23,13 +23,7 @@ using namespace mozilla::hal;
 namespace mozilla {
 namespace dom {
 
-BrowserBridgeParent::BrowserBridgeParent()
-    :
-#ifdef ACCESSIBILITY
-      mEmbedderAccessibleID(0),
-#endif
-      mIPCOpen(false) {
-}
+BrowserBridgeParent::BrowserBridgeParent() {}
 
 BrowserBridgeParent::~BrowserBridgeParent() { Destroy(); }
 
@@ -37,8 +31,6 @@ nsresult BrowserBridgeParent::Init(const nsString& aPresentationURL,
                                    const nsString& aRemoteType,
                                    const WindowGlobalInit& aWindowInit,
                                    const uint32_t& aChromeFlags, TabId aTabId) {
-  mIPCOpen = true;
-
   RefPtr<CanonicalBrowsingContext> browsingContext =
       aWindowInit.browsingContext()->Canonical();
 
@@ -120,7 +112,7 @@ CanonicalBrowsingContext* BrowserBridgeParent::GetBrowsingContext() {
 }
 
 BrowserParent* BrowserBridgeParent::Manager() {
-  MOZ_ASSERT(mIPCOpen);
+  MOZ_ASSERT(CanSend());
   return static_cast<BrowserParent*>(PBrowserBridgeParent::Manager());
 }
 
@@ -231,10 +223,7 @@ IPCResult BrowserBridgeParent::RecvSetEmbedderAccessible(
   return IPC_OK();
 }
 
-void BrowserBridgeParent::ActorDestroy(ActorDestroyReason aWhy) {
-  mIPCOpen = false;
-  Destroy();
-}
+void BrowserBridgeParent::ActorDestroy(ActorDestroyReason aWhy) { Destroy(); }
 
 }  // namespace dom
 }  // namespace mozilla

dom/ipc/BrowserBridgeParent.h

@@ -98,9 +98,8 @@ class BrowserBridgeParent : public PBrowserBridgeParent {
   RefPtr<BrowserParent> mBrowserParent;
 #if defined(ACCESSIBILITY)
   RefPtr<a11y::DocAccessibleParent> mEmbedderAccessibleDoc;
-  uint64_t mEmbedderAccessibleID;
+  uint64_t mEmbedderAccessibleID = 0;
 #endif  // defined(ACCESSIBILITY)
-  bool mIPCOpen;
 };
 
 }  // namespace dom