Bug 1203802 - Websocket Frame Listener API for devtool Network Inspector - part 1 - WindowID added into WebSocketChannel, r=michal

This commit is contained in:
Andrea Marchesini
2015-10-26 15:29:28 +00:00
parent e1d2bcea21
commit dd33dac0cc
16 changed files with 52 additions and 18 deletions

View File

@@ -456,6 +456,7 @@ WebSocketChannelChild::OnServerClose(const uint16_t& aCode,
NS_IMETHODIMP
WebSocketChannelChild::AsyncOpen(nsIURI *aURI,
const nsACString &aOrigin,
uint64_t aInnerWindowID,
nsIWebSocketListener *aListener,
nsISupports *aContext)
{
@@ -489,8 +490,8 @@ WebSocketChannelChild::AsyncOpen(nsIURI *aURI,
gNeckoChild->SendPWebSocketConstructor(this, tabChild,
IPC::SerializedLoadContext(this));
if (!SendAsyncOpen(uri, nsCString(aOrigin), mProtocol, mEncrypted,
mPingInterval, mClientSetPingInterval,
if (!SendAsyncOpen(uri, nsCString(aOrigin), aInnerWindowID, mProtocol,
mEncrypted, mPingInterval, mClientSetPingInterval,
mPingResponseTimeout, mClientSetPingTimeout, loadInfoArgs)) {
return NS_ERROR_UNEXPECTED;
}