Backout 41a3cdf92063 (bug 782649) for Linux xpcshell failures.

This commit is contained in:
Ryan VanderMeulen
2012-08-22 17:31:06 -04:00
parent 238d9bb1f6
commit c62b68efeb
21 changed files with 283 additions and 315 deletions

View File

@@ -11,9 +11,6 @@
#include "nsITabChild.h"
#include "nsILoadContext.h"
#include "nsNetUtil.h"
#include "mozilla/ipc/InputStreamUtils.h"
using namespace mozilla::ipc;
namespace mozilla {
namespace net {
@@ -384,10 +381,7 @@ WebSocketChannelChild::SendBinaryStream(nsIInputStream *aStream,
{
LOG(("WebSocketChannelChild::SendBinaryStream() %p\n", this));
OptionalInputStreamParams stream;
SerializeInputStream(aStream, stream);
if (!mIPCOpen || !SendSendBinaryStream(stream, aLength))
if (!mIPCOpen || !SendSendBinaryStream(IPC::InputStream(aStream), aLength))
return NS_ERROR_UNEXPECTED;
return NS_OK;
}