From 4c7424ec25e51a5c86fc81d5ece55b56576aaa5a Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 13 Jun 2017 16:16:07 -0400
Subject: [PATCH] Bug 1371699 part 2.  Implement nsICancelableRunnable on
 AsyncWaitRunnable.  r=bkelly

It's just luck that we haven't ended up with a multiplex stream on workers that contains at least one async stream.
---
 xpcom/io/nsMultiplexInputStream.cpp | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/xpcom/io/nsMultiplexInputStream.cpp b/xpcom/io/nsMultiplexInputStream.cpp
index 79d00b4a70ec..d5b52dbae132 100644
--- a/xpcom/io/nsMultiplexInputStream.cpp
+++ b/xpcom/io/nsMultiplexInputStream.cpp
@@ -54,6 +54,7 @@ public:
   NS_DECL_NSIASYNCINPUTSTREAM
 
   void AsyncWaitCompleted();
+  void AsyncWaitCanceled();
 
 private:
   ~nsMultiplexInputStream()
@@ -701,13 +702,13 @@ nsMultiplexInputStream::CloseWithStatus(nsresult aStatus)
 
 // This class is used to inform nsMultiplexInputStream that it's time to execute
 // the asyncWait callback.
-class AsyncWaitRunnable final : public Runnable
+class AsyncWaitRunnable final : public CancelableRunnable
 {
   RefPtr<nsMultiplexInputStream> mStream;
 
 public:
   explicit AsyncWaitRunnable(nsMultiplexInputStream* aStream)
-    : Runnable("AsyncWaitRunnable")
+    : CancelableRunnable("AsyncWaitRunnable")
     , mStream(aStream)
   {
     MOZ_ASSERT(aStream);
@@ -719,6 +720,12 @@ public:
     mStream->AsyncWaitCompleted();
     return NS_OK;
   }
+
+  nsresult Cancel() override
+  {
+    mStream->AsyncWaitCanceled();
+    return NS_OK;
+  }
 };
 
 // This helper class processes an array of nsIAsyncInputStreams, calling
@@ -877,6 +884,21 @@ nsMultiplexInputStream::AsyncWaitCompleted()
   callback->OnInputStreamReady(this);
 }
 
+void
+nsMultiplexInputStream::AsyncWaitCanceled()
+{
+  // The event target for our asyncwait decided to not process our event.  Go
+  // ahead and just notify our consumer that they should stop waiting for us,
+  // but that they can't get any data.  Let's hope that our AsyncWaitRunnables
+  // are always canceled on the thread we expect them to run on!  I don't see a
+  // way of checking for that, unfortunately.
+  {
+    MutexAutoLock lock(mLock);
+    mStatus = NS_BINDING_ABORTED;
+  }
+  AsyncWaitCompleted();
+}
+
 nsresult
 nsMultiplexInputStreamConstructor(nsISupports* aOuter,
                                   REFNSIID aIID,