Skip to content

Commit 4d8e79e

Browse files
bakulfbakulf
committed
Bug 1215092 - WebSocketEventService and WebSocket discovering - part 1 - Renaming WebSocketFrameService, r=michal
--HG-- rename : netwerk/protocol/websocket/PWebSocketFrameListener.ipdl => netwerk/protocol/websocket/PWebSocketEventListener.ipdl rename : netwerk/protocol/websocket/WebSocketFrameListenerChild.cpp => netwerk/protocol/websocket/WebSocketEventListenerChild.cpp rename : netwerk/protocol/websocket/WebSocketFrameListenerChild.h => netwerk/protocol/websocket/WebSocketEventListenerChild.h rename : netwerk/protocol/websocket/WebSocketFrameListenerParent.cpp => netwerk/protocol/websocket/WebSocketEventListenerParent.cpp rename : netwerk/protocol/websocket/WebSocketFrameListenerParent.h => netwerk/protocol/websocket/WebSocketEventListenerParent.h rename : netwerk/protocol/websocket/WebSocketFrameService.cpp => netwerk/protocol/websocket/WebSocketEventService.cpp rename : netwerk/protocol/websocket/WebSocketFrameService.h => netwerk/protocol/websocket/WebSocketEventService.h rename : netwerk/protocol/websocket/nsIWebSocketFrameService.idl => netwerk/protocol/websocket/nsIWebSocketEventService.idl
1 parent b4bb887 commit 4d8e79e

19 files changed

+166
-167
lines changed

‎dom/base/test/test_websocket_frame.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
.getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
2929
ok(innerId, "We have a valid innerWindowID: " + innerId);
3030

31-
var service = Cc["@mozilla.org/websocketframe/service;1"]
32-
.getService(Ci.nsIWebSocketFrameService);
33-
ok(!!service, "We have the nsIWebSocketFrameService");
31+
var service = Cc["@mozilla.org/websocketevent/service;1"]
32+
.getService(Ci.nsIWebSocketEventService);
33+
ok(!!service, "We have the nsIWebSocketEventService");
3434

3535
var listener = {
36-
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebSocketFrameListener]),
36+
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebSocketEventListener]),
3737

3838
frameReceived: function(aWebSocketSerialID, aFrame) {
3939
ok(!!aFrame, "We have received a frame");

‎layout/build/nsLayoutModule.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ static void Shutdown();
231231
#include "mozilla/dom/nsMixedContentBlocker.h"
232232

233233
#include "AudioChannelService.h"
234-
#include "mozilla/net/WebSocketFrameService.h"
234+
#include "mozilla/net/WebSocketEventService.h"
235235

236236
#include "mozilla/dom/DataStoreService.h"
237237

@@ -633,8 +633,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(Geolocation, Init)
633633
#define NS_AUDIOCHANNEL_SERVICE_CID \
634634
{ 0xf712e983, 0x048a, 0x443f, { 0x88, 0x02, 0xfc, 0xc3, 0xd9, 0x27, 0xce, 0xac }}
635635

636-
#define NS_WEBSOCKETFRAME_SERVICE_CID \
637-
{ 0x5973dd8f, 0xed2c, 0x41ff, { 0x9e, 0x64, 0x25, 0x1f, 0xf5, 0x5a, 0x67, 0xb9 }}
636+
#define NS_WEBSOCKETEVENT_SERVICE_CID \
637+
{ 0x31689828, 0xda66, 0x49a6, { 0x87, 0x0c, 0xdf, 0x62, 0xb8, 0x3f, 0xe7, 0x89 }}
638638

639639
#define NS_DATASTORE_SERVICE_CID \
640640
{ 0x0d4285fe, 0xf1b3, 0x49fa, { 0xbc, 0x51, 0xa4, 0xa8, 0x3f, 0x0a, 0xaf, 0x85 }}
@@ -643,7 +643,7 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsGeolocationService, nsGeolocationServ
643643

644644
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(AudioChannelService, AudioChannelService::GetOrCreate)
645645

646-
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(WebSocketFrameService, WebSocketFrameService::GetOrCreate)
646+
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(WebSocketEventService, WebSocketEventService::GetOrCreate)
647647

648648
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(DataStoreService, DataStoreService::GetOrCreate)
649649

@@ -795,7 +795,7 @@ NS_DEFINE_NAMED_CID(NS_TEXTSERVICESDOCUMENT_CID);
795795
NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID);
796796
NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID);
797797
NS_DEFINE_NAMED_CID(NS_AUDIOCHANNEL_SERVICE_CID);
798-
NS_DEFINE_NAMED_CID(NS_WEBSOCKETFRAME_SERVICE_CID);
798+
NS_DEFINE_NAMED_CID(NS_WEBSOCKETEVENT_SERVICE_CID);
799799
NS_DEFINE_NAMED_CID(NS_DATASTORE_SERVICE_CID);
800800
NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID);
801801
NS_DEFINE_NAMED_CID(NS_CONTENTSECURITYMANAGER_CID);
@@ -1103,7 +1103,7 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
11031103
{ &kNS_GEOLOCATION_SERVICE_CID, false, nullptr, nsGeolocationServiceConstructor },
11041104
{ &kNS_GEOLOCATION_CID, false, nullptr, GeolocationConstructor },
11051105
{ &kNS_AUDIOCHANNEL_SERVICE_CID, false, nullptr, AudioChannelServiceConstructor },
1106-
{ &kNS_WEBSOCKETFRAME_SERVICE_CID, false, nullptr, WebSocketFrameServiceConstructor },
1106+
{ &kNS_WEBSOCKETEVENT_SERVICE_CID, false, nullptr, WebSocketEventServiceConstructor },
11071107
{ &kNS_DATASTORE_SERVICE_CID, false, nullptr, DataStoreServiceConstructor },
11081108
{ &kNS_FOCUSMANAGER_CID, false, nullptr, CreateFocusManager },
11091109
#ifdef MOZ_WEBSPEECH_TEST_BACKEND
@@ -1271,7 +1271,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
12711271
{ "@mozilla.org/geolocation/service;1", &kNS_GEOLOCATION_SERVICE_CID },
12721272
{ "@mozilla.org/geolocation;1", &kNS_GEOLOCATION_CID },
12731273
{ "@mozilla.org/audiochannel/service;1", &kNS_AUDIOCHANNEL_SERVICE_CID },
1274-
{ "@mozilla.org/websocketframe/service;1", &kNS_WEBSOCKETFRAME_SERVICE_CID },
1274+
{ "@mozilla.org/websocketevent/service;1", &kNS_WEBSOCKETEVENT_SERVICE_CID },
12751275
{ "@mozilla.org/datastore-service;1", &kNS_DATASTORE_SERVICE_CID },
12761276
{ "@mozilla.org/focus-manager;1", &kNS_FOCUSMANAGER_CID },
12771277
#ifdef MOZ_WEBSPEECH_TEST_BACKEND

‎netwerk/ipc/NeckoChild.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "mozilla/net/WyciwygChannelChild.h"
1616
#include "mozilla/net/FTPChannelChild.h"
1717
#include "mozilla/net/WebSocketChannelChild.h"
18-
#include "mozilla/net/WebSocketFrameListenerChild.h"
18+
#include "mozilla/net/WebSocketEventListenerChild.h"
1919
#include "mozilla/net/DNSRequestChild.h"
2020
#include "mozilla/net/RemoteOpenFileChild.h"
2121
#include "mozilla/net/ChannelDiverterChild.h"
@@ -159,19 +159,19 @@ NeckoChild::DeallocPWebSocketChild(PWebSocketChild* child)
159159
return true;
160160
}
161161

162-
PWebSocketFrameListenerChild*
163-
NeckoChild::AllocPWebSocketFrameListenerChild(const uint64_t& aInnerWindowID)
162+
PWebSocketEventListenerChild*
163+
NeckoChild::AllocPWebSocketEventListenerChild(const uint64_t& aInnerWindowID)
164164
{
165-
RefPtr<WebSocketFrameListenerChild> c =
166-
new WebSocketFrameListenerChild(aInnerWindowID);
165+
RefPtr<WebSocketEventListenerChild> c =
166+
new WebSocketEventListenerChild(aInnerWindowID);
167167
return c.forget().take();
168168
}
169169

170170
bool
171-
NeckoChild::DeallocPWebSocketFrameListenerChild(PWebSocketFrameListenerChild* aActor)
171+
NeckoChild::DeallocPWebSocketEventListenerChild(PWebSocketEventListenerChild* aActor)
172172
{
173-
RefPtr<WebSocketFrameListenerChild> c =
174-
dont_AddRef(static_cast<WebSocketFrameListenerChild*>(aActor));
173+
RefPtr<WebSocketEventListenerChild> c =
174+
dont_AddRef(static_cast<WebSocketEventListenerChild*>(aActor));
175175
MOZ_ASSERT(c);
176176
return true;
177177
}

‎netwerk/ipc/NeckoChild.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ class NeckoChild :
7979
const nsString& aRealm,
8080
const uint64_t& aCallbackId) override;
8181
virtual bool RecvAppOfflineStatus(const uint32_t& aId, const bool& aOffline) override;
82-
virtual PWebSocketFrameListenerChild*
83-
AllocPWebSocketFrameListenerChild(const uint64_t& aInnerWindowID) override;
84-
virtual bool DeallocPWebSocketFrameListenerChild(PWebSocketFrameListenerChild*) override;
82+
virtual PWebSocketEventListenerChild*
83+
AllocPWebSocketEventListenerChild(const uint64_t& aInnerWindowID) override;
84+
virtual bool DeallocPWebSocketEventListenerChild(PWebSocketEventListenerChild*) override;
8585

8686
/* Predictor Messsages */
8787
virtual bool RecvPredOnPredictPreconnect(const URIParams& aURI) override;

‎netwerk/ipc/NeckoParent.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "mozilla/net/WyciwygChannelParent.h"
1414
#include "mozilla/net/FTPChannelParent.h"
1515
#include "mozilla/net/WebSocketChannelParent.h"
16-
#include "mozilla/net/WebSocketFrameListenerParent.h"
16+
#include "mozilla/net/WebSocketEventListenerParent.h"
1717
#include "mozilla/net/DataChannelParent.h"
1818
#ifdef NECKO_PROTOCOL_rtsp
1919
#include "mozilla/net/RtspControllerParent.h"
@@ -348,19 +348,19 @@ NeckoParent::DeallocPWebSocketParent(PWebSocketParent* actor)
348348
return true;
349349
}
350350

351-
PWebSocketFrameListenerParent*
352-
NeckoParent::AllocPWebSocketFrameListenerParent(const uint64_t& aInnerWindowID)
351+
PWebSocketEventListenerParent*
352+
NeckoParent::AllocPWebSocketEventListenerParent(const uint64_t& aInnerWindowID)
353353
{
354-
RefPtr<WebSocketFrameListenerParent> c =
355-
new WebSocketFrameListenerParent(aInnerWindowID);
354+
RefPtr<WebSocketEventListenerParent> c =
355+
new WebSocketEventListenerParent(aInnerWindowID);
356356
return c.forget().take();
357357
}
358358

359359
bool
360-
NeckoParent::DeallocPWebSocketFrameListenerParent(PWebSocketFrameListenerParent* aActor)
360+
NeckoParent::DeallocPWebSocketEventListenerParent(PWebSocketEventListenerParent* aActor)
361361
{
362-
RefPtr<WebSocketFrameListenerParent> c =
363-
dont_AddRef(static_cast<WebSocketFrameListenerParent*>(aActor));
362+
RefPtr<WebSocketEventListenerParent> c =
363+
dont_AddRef(static_cast<WebSocketEventListenerParent*>(aActor));
364364
MOZ_ASSERT(c);
365365
return true;
366366
}

‎netwerk/ipc/NeckoParent.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ class NeckoParent
172172
virtual bool RecvCancelHTMLDNSPrefetch(const nsString& hostname,
173173
const uint16_t& flags,
174174
const nsresult& reason) override;
175-
virtual PWebSocketFrameListenerParent*
176-
AllocPWebSocketFrameListenerParent(const uint64_t& aInnerWindowID) override;
177-
virtual bool DeallocPWebSocketFrameListenerParent(PWebSocketFrameListenerParent*) override;
175+
virtual PWebSocketEventListenerParent*
176+
AllocPWebSocketEventListenerParent(const uint64_t& aInnerWindowID) override;
177+
virtual bool DeallocPWebSocketEventListenerParent(PWebSocketEventListenerParent*) override;
178178

179179
virtual mozilla::ipc::IProtocol*
180180
CloneProtocol(Channel* aChannel,

‎netwerk/ipc/PNecko.ipdl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include protocol PBrowser;
1212
include protocol PWyciwygChannel;
1313
include protocol PFTPChannel;
1414
include protocol PWebSocket;
15-
include protocol PWebSocketFrameListener;
15+
include protocol PWebSocketEventListener;
1616
include protocol PTCPSocket;
1717
include protocol PTCPServerSocket;
1818
include protocol PUDPSocket;
@@ -46,7 +46,7 @@ prio(normal upto urgent) sync protocol PNecko
4646
manages PWyciwygChannel;
4747
manages PFTPChannel;
4848
manages PWebSocket;
49-
manages PWebSocketFrameListener;
49+
manages PWebSocketEventListener;
5050
manages PTCPSocket;
5151
manages PTCPServerSocket;
5252
manages PUDPSocket;
@@ -74,7 +74,7 @@ parent:
7474

7575
PDNSRequest(nsCString hostName, uint32_t flags, nsCString networkInterface);
7676

77-
PWebSocketFrameListener(uint64_t aInnerWindowID);
77+
PWebSocketEventListener(uint64_t aInnerWindowID);
7878

7979
/* Predictor Methods */
8080
PredPredict(OptionalURIParams targetURI, OptionalURIParams sourceURI,

‎netwerk/protocol/websocket/PWebSocketFrameListener.ipdl renamed to ‎netwerk/protocol/websocket/PWebSocketEventListener.ipdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using mozilla::net::WebSocketFrameData from "ipc/IPCMessageUtils.h";
1212
namespace mozilla {
1313
namespace net {
1414

15-
async protocol PWebSocketFrameListener
15+
async protocol PWebSocketEventListener
1616
{
1717
manager PNecko;
1818

‎netwerk/protocol/websocket/WebSocketChannel.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "mozilla/Attributes.h"
1313
#include "mozilla/Endian.h"
1414
#include "mozilla/MathAlgorithms.h"
15-
#include "mozilla/net/WebSocketFrameService.h"
15+
#include "mozilla/net/WebSocketEventService.h"
1616

1717
#include "nsIURI.h"
1818
#include "nsIChannel.h"
@@ -1196,7 +1196,7 @@ WebSocketChannel::WebSocketChannel() :
11961196

11971197
mSerial = sSerialSeed++;
11981198

1199-
mFrameService = WebSocketFrameService::GetOrCreate();
1199+
mService = WebSocketEventService::GetOrCreate();
12001200
}
12011201

12021202
WebSocketChannel::~WebSocketChannel()
@@ -1228,7 +1228,7 @@ WebSocketChannel::~WebSocketChannel()
12281228

12291229
NS_ReleaseOnMainThread(mLoadGroup);
12301230
NS_ReleaseOnMainThread(mLoadInfo);
1231-
NS_ReleaseOnMainThread(static_cast<nsIWebSocketFrameService*>(mFrameService.forget().take()));
1231+
NS_ReleaseOnMainThread(static_cast<nsIWebSocketEventService*>(mService.forget().take()));
12321232
}
12331233

12341234
NS_IMETHODIMP
@@ -1699,11 +1699,11 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
16991699
}
17001700

17011701
RefPtr<WebSocketFrame> frame =
1702-
mFrameService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
1703-
opcode, maskBit, mask, utf8Data);
1702+
mService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
1703+
opcode, maskBit, mask, utf8Data);
17041704

17051705
if (frame) {
1706-
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
1706+
mService->FrameReceived(mSerial, mInnerWindowID, frame);
17071707
}
17081708

17091709
mTargetThread->Dispatch(new CallOnMessageAvailable(this, utf8Data, -1),
@@ -1722,9 +1722,9 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
17221722
}
17231723

17241724
RefPtr<WebSocketFrame> frame =
1725-
mFrameService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
1726-
opcode, maskBit, mask, payload,
1727-
payloadLength);
1725+
mService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
1726+
opcode, maskBit, mask, payload,
1727+
payloadLength);
17281728

17291729
if (opcode == nsIWebSocketFrame::OPCODE_CLOSE) {
17301730
LOG(("WebSocketChannel:: close received\n"));
@@ -1762,7 +1762,7 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
17621762
if (frame) {
17631763
// We send the frame immediately becuase we want to have it dispatched
17641764
// before the CallOnServerClose.
1765-
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
1765+
mService->FrameReceived(mSerial, mInnerWindowID, frame);
17661766
frame = nullptr;
17671767
}
17681768

@@ -1802,7 +1802,7 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
18021802
}
18031803

18041804
if (frame) {
1805-
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
1805+
mService->FrameReceived(mSerial, mInnerWindowID, frame);
18061806
}
18071807
} else if (opcode == nsIWebSocketFrame::OPCODE_BINARY) {
18081808
bool isDeflated = mPMCECompressor && mPMCECompressor->IsMessageDeflated();
@@ -1828,10 +1828,10 @@ WebSocketChannel::ProcessInput(uint8_t *buffer, uint32_t count)
18281828
}
18291829

18301830
RefPtr<WebSocketFrame> frame =
1831-
mFrameService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
1832-
opcode, maskBit, mask, binaryData);
1831+
mService->CreateFrameIfNeeded(finBit, rsvBit1, rsvBit2, rsvBit3,
1832+
opcode, maskBit, mask, binaryData);
18331833
if (frame) {
1834-
mFrameService->FrameReceived(mSerial, mInnerWindowID, frame);
1834+
mService->FrameReceived(mSerial, mInnerWindowID, frame);
18351835
}
18361836

18371837
mTargetThread->Dispatch(
@@ -2177,7 +2177,7 @@ WebSocketChannel::PrimeNewOutgoingMessage()
21772177
// For real data frames we ship the bulk of the payload off to ApplyMask()
21782178

21792179
RefPtr<WebSocketFrame> frame =
2180-
mFrameService->CreateFrameIfNeeded(
2180+
mService->CreateFrameIfNeeded(
21812181
mOutHeader[0] & WebSocketChannel::kFinalFragBit,
21822182
mOutHeader[0] & WebSocketChannel::kRsv1Bit,
21832183
mOutHeader[0] & WebSocketChannel::kRsv2Bit,
@@ -2190,7 +2190,7 @@ WebSocketChannel::PrimeNewOutgoingMessage()
21902190
mCurrentOut->OrigLength());
21912191

21922192
if (frame) {
2193-
mFrameService->FrameSent(mSerial, mInnerWindowID, frame);
2193+
mService->FrameSent(mSerial, mInnerWindowID, frame);
21942194
}
21952195

21962196
while (payload < (mOutHeader + mHdrOutToSend)) {

‎netwerk/protocol/websocket/WebSocketChannel.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class CallOnMessageAvailable;
5050
class CallOnStop;
5151
class CallOnServerClose;
5252
class CallAcknowledge;
53-
class WebSocketFrameService;
53+
class WebSocketEventService;
5454

5555
// Used to enforce "1 connecting websocket per host" rule, and reconnect delays
5656
enum wsConnectingState {
@@ -227,7 +227,7 @@ class WebSocketChannel : public BaseWebSocketChannel,
227227
const static int32_t kLingeringCloseTimeout = 1000;
228228
const static int32_t kLingeringCloseThreshold = 50;
229229

230-
RefPtr<WebSocketFrameService> mFrameService;
230+
RefPtr<WebSocketEventService> mService;
231231

232232
int32_t mMaxConcurrentConnections;
233233

‎netwerk/protocol/websocket/WebSocketFrameListenerChild.cpp renamed to ‎netwerk/protocol/websocket/WebSocketEventListenerChild.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
55
* You can obtain one at http://mozilla.org/MPL/2.0/. */
66

7-
#include "WebSocketFrameListenerChild.h"
7+
#include "WebSocketEventListenerChild.h"
88

9+
#include "WebSocketEventService.h"
910
#include "WebSocketFrame.h"
10-
#include "WebSocketFrameService.h"
1111

1212
namespace mozilla {
1313
namespace net {
1414

15-
WebSocketFrameListenerChild::WebSocketFrameListenerChild(uint64_t aInnerWindowID)
16-
: mService(WebSocketFrameService::GetOrCreate())
15+
WebSocketEventListenerChild::WebSocketEventListenerChild(uint64_t aInnerWindowID)
16+
: mService(WebSocketEventService::GetOrCreate())
1717
, mInnerWindowID(aInnerWindowID)
1818
{}
1919

20-
WebSocketFrameListenerChild::~WebSocketFrameListenerChild()
20+
WebSocketEventListenerChild::~WebSocketEventListenerChild()
2121
{
2222
MOZ_ASSERT(!mService);
2323
}
2424

2525
bool
26-
WebSocketFrameListenerChild::RecvFrameReceived(const uint32_t& aWebSocketSerialID,
26+
WebSocketEventListenerChild::RecvFrameReceived(const uint32_t& aWebSocketSerialID,
2727
const WebSocketFrameData& aFrameData)
2828
{
2929
if (mService) {
@@ -35,7 +35,7 @@ WebSocketFrameListenerChild::RecvFrameReceived(const uint32_t& aWebSocketSerialI
3535
}
3636

3737
bool
38-
WebSocketFrameListenerChild::RecvFrameSent(const uint32_t& aWebSocketSerialID,
38+
WebSocketEventListenerChild::RecvFrameSent(const uint32_t& aWebSocketSerialID,
3939
const WebSocketFrameData& aFrameData)
4040
{
4141
if (mService) {
@@ -47,14 +47,14 @@ WebSocketFrameListenerChild::RecvFrameSent(const uint32_t& aWebSocketSerialID,
4747
}
4848

4949
void
50-
WebSocketFrameListenerChild::Close()
50+
WebSocketEventListenerChild::Close()
5151
{
5252
mService = nullptr;
5353
SendClose();
5454
}
5555

5656
void
57-
WebSocketFrameListenerChild::ActorDestroy(ActorDestroyReason aWhy)
57+
WebSocketEventListenerChild::ActorDestroy(ActorDestroyReason aWhy)
5858
{
5959
mService = nullptr;
6060
}

0 commit comments

Comments
 (0)