Backed out changeset aeeb739b7ba7 (bug 1310547)

ipc/glue/MessageChannel.cpp

@@ -512,8 +512,8 @@ MessageChannel::MessageChannel(MessageListener *aListener)
         NewNonOwningCancelableRunnableMethod(this, &MessageChannel::OnMaybeDequeueOne);
     mDequeueOneTask = new RefCountedTask(runnable.forget());
 
-    mOnChannelConnectedTask =
-        NewNonOwningCancelableRunnableMethod(this, &MessageChannel::DispatchOnChannelConnected);
+    runnable = NewNonOwningCancelableRunnableMethod(this, &MessageChannel::DispatchOnChannelConnected);
+    mOnChannelConnectedTask = new RefCountedTask(runnable.forget());
 
 #ifdef OS_WIN
     mEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr);
@@ -1943,7 +1943,7 @@ MessageChannel::OnChannelConnected(int32_t peer_id)
     MOZ_RELEASE_ASSERT(!mPeerPidSet);
     mPeerPidSet = true;
     mPeerPid = peer_id;
-    RefPtr<CancelableRunnable> task = mOnChannelConnectedTask;
+    RefPtr<DequeueTask> task = new DequeueTask(mOnChannelConnectedTask);
     mWorkerLoop->PostTask(task.forget());
 }
 

ipc/glue/MessageChannel.h

@@ -788,7 +788,7 @@ class MessageChannel : HasResultCodes
     // Task and state used to asynchronously notify channel has been connected
     // safely.  This is necessary to be able to cancel notification if we are
     // closed at the same time.
-    RefPtr<CancelableRunnable> mOnChannelConnectedTask;
+    RefPtr<RefCountedTask> mOnChannelConnectedTask;
     bool mPeerPidSet;
     int32_t mPeerPid;
 };