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

Bug 1215092 - WebSocketEventService and WebSocket discovering - part 1 - Renaming WebSocketFrameService, r=michal

Browse Source
This commit is contained in:
Andrea Marchesini
2015-10-28 19:10:20 +00:00
parent 407306e9ba
commit b8a7c5f9e2
19 changed files with 166 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -12,7 +12,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/Endian.h"
#include "mozilla/MathAlgorithms.h"
#include "mozilla/net/WebSocketFrameService.h"
#include "mozilla/net/WebSocketEventService.h"
#include "nsIURI.h"
#include "nsIChannel.h"
@@ -1196,7 +1196,7 @@ WebSocketChannel::WebSocketChannel() :
mSerial = sSerialSeed++;
mFrameService = WebSocketFrameService::GetOrCreate();
mService = WebSocketEventService::GetOrCreate();
}
WebSocketChannel::~WebSocketChannel()
@@ -1228,7 +1228,7 @@ WebSocketChannel::~WebSocketChannel()
NS_ReleaseOnMainThread(mLoadGroup);
NS_ReleaseOnMainThread(mLoadInfo);
NS_ReleaseOnMainThread(static_cast<nsIWebSocketFrameService*>(mFrameService.forget().take()));
NS_ReleaseOnMainThread(static_cast<nsIWebSocketEventService*>(mService.forget().take()));
}
NS_IMETHODIMP
@@ -1699,11 +1699,11 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
}
RefPtr<WebSocketFrame> frame =
mFrameService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
opcode, maskBit, mask, utf8Data);
mService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
opcode, maskBit, mask, utf8Data);
if (frame) {
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
mService->FrameReceived(mSerial, mInnerWindowID, frame);
}
mTargetThread->Dispatch(new CallOnMessageAvailable(this, utf8Data, -1),
@@ -1722,9 +1722,9 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
}
RefPtr<WebSocketFrame> frame =
mFrameService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
opcode, maskBit, mask, payload,
payloadLength);
mService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
opcode, maskBit, mask, payload,
payloadLength);
if (opcode == nsIWebSocketFrame::OPCODE_CLOSE) {
LOG(("WebSocketChannel:: close received\n"));
@@ -1762,7 +1762,7 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
if (frame) {
// We send the frame immediately becuase we want to have it dispatched
// before the CallOnServerClose.
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
mService->FrameReceived(mSerial, mInnerWindowID, frame);
frame = nullptr;
}
@@ -1802,7 +1802,7 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
}
if (frame) {
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
mService->FrameReceived(mSerial, mInnerWindowID, frame);
}
} else if (opcode == nsIWebSocketFrame::OPCODE_BINARY) {
bool isDeflated = mPMCECompressor && mPMCECompressor->IsMessageDeflated();
@@ -1828,10 +1828,10 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
}
RefPtr<WebSocketFrame> frame =
mFrameService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
opcode, maskBit, mask, binaryData);
mService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
opcode, maskBit, mask, binaryData);
if (frame) {
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
mService->FrameReceived(mSerial, mInnerWindowID, frame);
}
mTargetThread->Dispatch(
@@ -2177,7 +2177,7 @@ WebSocketChannel::PrimeNewOutgoingMessage()
// For real data frames we ship the bulk of the payload off to ApplyMask()
RefPtr<WebSocketFrame> frame =
mFrameService->CreateFrameIfNeeded(
mService->CreateFrameIfNeeded(
mOutHeader[0] & WebSocketChannel::kFinalFragBit,
mOutHeader[0] & WebSocketChannel::kRsv1Bit,
mOutHeader[0] & WebSocketChannel::kRsv2Bit,
@@ -2190,7 +2190,7 @@ WebSocketChannel::PrimeNewOutgoingMessage()
mCurrentOut->OrigLength());
if (frame) {
mFrameService->FrameSent(mSerial, mInnerWindowID, frame);
mService->FrameSent(mSerial, mInnerWindowID, frame);
}
while (payload < (mOutHeader + mHdrOutToSend)) {