corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
netwerk/protocol/websocket/WebSocketChannelParent.cpp
View File

@@ -8,9 +8,6 @@
#include "WebSocketChannelParent.h"
#include "nsIAuthPromptProvider.h"
#include "mozilla/LoadContext.h"
#include "mozilla/ipc/InputStreamUtils.h"
using namespace mozilla::ipc;
namespace mozilla {
namespace net {
@@ -117,16 +114,12 @@ WebSocketChannelParent::RecvSendBinaryMsg(const nsCString& aMsg)
}
bool
WebSocketChannelParent::RecvSendBinaryStream(const InputStreamParams& aStream,
WebSocketChannelParent::RecvSendBinaryStream(const InputStream& aStream,
const uint32_t& aLength)
{
LOG(("WebSocketChannelParent::RecvSendBinaryStream() %p\n", this));
if (mChannel) {
nsCOMPtr<nsIInputStream> stream = DeserializeInputStream(aStream);
if (!stream) {
return false;
}
nsresult rv = mChannel->SendBinaryStream(stream, aLength);
nsresult rv = mChannel->SendBinaryStream(aStream, aLength);
NS_ENSURE_SUCCESS(rv, true);
}
return true;