Bug 966439 - BroadcastChannel API - patch 8 - Async BC.close(), r=bent

dom/broadcastchannel/BroadcastChannel.cpp

@@ -232,6 +232,37 @@ private:
 
 NS_IMPL_ISUPPORTS(PostMessageRunnable, nsICancelableRunnable, nsIRunnable)
 
+class CloseRunnable MOZ_FINAL : public nsICancelableRunnable
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  CloseRunnable(BroadcastChannel* aBC)
+    : mBC(aBC)
+  {
+    MOZ_ASSERT(mBC);
+  }
+
+  NS_IMETHODIMP Run()
+  {
+    mBC->Shutdown();
+    return NS_OK;
+  }
+
+  NS_IMETHODIMP Cancel()
+  {
+    mBC = nullptr;
+    return NS_OK;
+  }
+
+private:
+  ~CloseRunnable() {}
+
+  nsRefPtr<BroadcastChannel> mBC;
+};
+
+NS_IMPL_ISUPPORTS(CloseRunnable, nsICancelableRunnable, nsIRunnable)
+
 class TeardownRunnable MOZ_FINAL : public nsICancelableRunnable
 {
 public:
@@ -474,7 +505,12 @@ BroadcastChannel::Constructor(const GlobalObject& aGlobal,
     new BroadcastChannel(window, principalInfo, origin, aChannel);
 
   // Register this component to PBackground.
-  ipc::BackgroundChild::GetOrCreateForCurrentThread(bc);
+  PBackgroundChild* actor = BackgroundChild::GetForCurrentThread();
+  if (actor) {
+    bc->ActorCreated(actor);
+  } else {
+    BackgroundChild::GetOrCreateForCurrentThread(bc);
+  }
 
   if (!workerPrivate) {
     MOZ_ASSERT(window);
@@ -550,7 +586,16 @@ BroadcastChannel::Close()
   }
 
   if (mPendingMessages.IsEmpty()) {
-    Shutdown();
+    // We cannot call Shutdown() immediatelly because we could have some
+    // postMessage runnable already dispatched. Instead, we change the state to
+    // StateClosed and we shutdown the actor asynchrounsly.
+
+    mState = StateClosed;
+    nsRefPtr<CloseRunnable> runnable = new CloseRunnable(this);
+
+    if (NS_FAILED(NS_DispatchToCurrentThread(runnable))) {
+      NS_WARNING("Failed to dispatch to the current thread!");
+    }
   } else {
     MOZ_ASSERT(!mActor);
     mState = StateClosing;
@@ -564,7 +609,7 @@ BroadcastChannel::ActorFailed()
 }
 
 void
-BroadcastChannel::ActorCreated(ipc::PBackgroundChild* aActor)
+BroadcastChannel::ActorCreated(PBackgroundChild* aActor)
 {
   MOZ_ASSERT(aActor);
 

dom/broadcastchannel/BroadcastChannel.h

@@ -79,6 +79,11 @@ public:
 
   void Shutdown();
 
+  bool IsClosed() const
+  {
+    return mState != StateActive;
+  }
+
 private:
   BroadcastChannel(nsPIDOMWindow* aWindow,
                    const PrincipalInfo& aPrincipalInfo,

dom/broadcastchannel/BroadcastChannelChild.cpp

@@ -44,8 +44,9 @@ BroadcastChannelChild::RecvNotify(const ClonedMessageData& aData)
   nsCOMPtr<DOMEventTargetHelper> helper = mBC;
   nsCOMPtr<EventTarget> eventTarget = do_QueryInterface(helper);
 
-  // This object is going to be deleted soon. No notify is required.
-  if (!eventTarget) {
+  // This object has been already closed by content or is going to be deleted
+  // soon. No notify is required.
+  if (!eventTarget || mBC->IsClosed()) {
     return true;
   }