From fd134a95ca41db9f8f93dad29fbc03485682eca3 Mon Sep 17 00:00:00 2001 From: Butkovits Atila Date: Mon, 14 Dec 2020 15:42:52 +0200 Subject: [PATCH] Backed out changeset 084279c12a76 (bug 1675207) for build bustage complaining about rules.mk. CLOSED TREE --- dom/websocket/WebSocket.cpp | 17 --------- .../websocket/WebSocketChannelChild.cpp | 38 +++---------------- .../websocket/WebSocketChannelChild.h | 5 +-- .../websocket/WebSocketChannelParent.cpp | 3 -- .../websocket/nsIWebSocketListener.idl | 6 --- 5 files changed, 7 insertions(+), 62 deletions(-) diff --git a/dom/websocket/WebSocket.cpp b/dom/websocket/WebSocket.cpp index 1df3136e0d62..b0452eec6792 100644 --- a/dom/websocket/WebSocket.cpp +++ b/dom/websocket/WebSocket.cpp @@ -860,23 +860,6 @@ WebSocketImpl::OnServerClose(nsISupports* aContext, uint16_t aCode, return NS_OK; } -NS_IMETHODIMP -WebSocketImpl::OnError() { - if (!IsTargetThread()) { - return Dispatch( - NS_NewRunnableFunction("dom::FailConnectionRunnable", - [self = RefPtr{this}]() { - self->FailConnection( - nsIWebSocketChannel::CLOSE_ABNORMAL); - }), - NS_DISPATCH_NORMAL); - } - - AssertIsOnTargetThread(); - FailConnection(nsIWebSocketChannel::CLOSE_ABNORMAL); - return NS_OK; -} - //----------------------------------------------------------------------------- // WebSocketImpl::nsIInterfaceRequestor //----------------------------------------------------------------------------- diff --git a/netwerk/protocol/websocket/WebSocketChannelChild.cpp b/netwerk/protocol/websocket/WebSocketChannelChild.cpp index ae9da1028fef..13c137f0f219 100644 --- a/netwerk/protocol/websocket/WebSocketChannelChild.cpp +++ b/netwerk/protocol/websocket/WebSocketChannelChild.cpp @@ -294,44 +294,22 @@ class MessageEvent : public WebSocketEvent { bool mBinary; }; -bool WebSocketChannelChild::RecvOnMessageAvailableInternal( +void WebSocketChannelChild::RecvOnMessageAvailableInternal( const nsDependentCSubstring& aMsg, bool aMoreData, bool aBinary) { if (aMoreData) { - return mReceivedMsgBuffer.Append(aMsg, fallible); - } - - if (!mReceivedMsgBuffer.Append(aMsg, fallible)) { - return false; + mReceivedMsgBuffer.Append(aMsg); + return; } + mReceivedMsgBuffer.Append(aMsg); mEventQ->RunOrEnqueue(new EventTargetDispatcher( this, new MessageEvent(mReceivedMsgBuffer, aBinary), mTargetThread)); mReceivedMsgBuffer.Truncate(); - return true; -} - -class OnErrorEvent : public WebSocketEvent { - public: - OnErrorEvent() = default; - - void Run(WebSocketChannelChild* aChild) override { aChild->OnError(); } -}; - -void WebSocketChannelChild::OnError() { - LOG(("WebSocketChannelChild::OnError() %p", this)); - if (mListenerMT) { - AutoEventEnqueuer ensureSerialDispatch(mEventQ); - Unused << mListenerMT->mListener->OnError(); - } } mozilla::ipc::IPCResult WebSocketChannelChild::RecvOnMessageAvailable( const nsDependentCSubstring& aMsg, const bool& aMoreData) { - if (!RecvOnMessageAvailableInternal(aMsg, aMoreData, false)) { - LOG(("WebSocketChannelChild %p append message failed", this)); - mEventQ->RunOrEnqueue( - new EventTargetDispatcher(this, new OnErrorEvent(), mTargetThread)); - } + RecvOnMessageAvailableInternal(aMsg, aMoreData, false); return IPC_OK(); } @@ -353,11 +331,7 @@ void WebSocketChannelChild::OnMessageAvailable(const nsCString& aMsg) { mozilla::ipc::IPCResult WebSocketChannelChild::RecvOnBinaryMessageAvailable( const nsDependentCSubstring& aMsg, const bool& aMoreData) { - if (!RecvOnMessageAvailableInternal(aMsg, aMoreData, true)) { - LOG(("WebSocketChannelChild %p append message failed", this)); - mEventQ->RunOrEnqueue( - new EventTargetDispatcher(this, new OnErrorEvent(), mTargetThread)); - } + RecvOnMessageAvailableInternal(aMsg, aMoreData, true); return IPC_OK(); } diff --git a/netwerk/protocol/websocket/WebSocketChannelChild.h b/netwerk/protocol/websocket/WebSocketChannelChild.h index 4be4ada669f0..57fa335bf8df 100644 --- a/netwerk/protocol/websocket/WebSocketChannelChild.h +++ b/netwerk/protocol/websocket/WebSocketChannelChild.h @@ -82,11 +82,9 @@ class WebSocketChannelChild final : public BaseWebSocketChannel, // This function tries to get a labeled event target for |mNeckoTarget|. void SetupNeckoTarget(); - bool RecvOnMessageAvailableInternal(const nsDependentCSubstring& aMsg, + void RecvOnMessageAvailableInternal(const nsDependentCSubstring& aMsg, bool aMoreData, bool aBinary); - void OnError(); - RefPtr mEventQ; nsString mEffectiveURL; nsCString mReceivedMsgBuffer; @@ -102,7 +100,6 @@ class WebSocketChannelChild final : public BaseWebSocketChannel, friend class AcknowledgeEvent; friend class ServerCloseEvent; friend class AsyncOpenFailedEvent; - friend class OnErrorEvent; }; } // namespace net diff --git a/netwerk/protocol/websocket/WebSocketChannelParent.cpp b/netwerk/protocol/websocket/WebSocketChannelParent.cpp index a1c352447148..c6fcd23e4cb5 100644 --- a/netwerk/protocol/websocket/WebSocketChannelParent.cpp +++ b/netwerk/protocol/websocket/WebSocketChannelParent.cpp @@ -307,9 +307,6 @@ WebSocketChannelParent::OnServerClose(nsISupports* aContext, uint16_t code, return NS_OK; } -NS_IMETHODIMP -WebSocketChannelParent::OnError() { return NS_OK; } - void WebSocketChannelParent::ActorDestroy(ActorDestroyReason why) { LOG(("WebSocketChannelParent::ActorDestroy() %p\n", this)); diff --git a/netwerk/protocol/websocket/nsIWebSocketListener.idl b/netwerk/protocol/websocket/nsIWebSocketListener.idl index 4a8416b7580d..f49009d5ae86 100644 --- a/netwerk/protocol/websocket/nsIWebSocketListener.idl +++ b/netwerk/protocol/websocket/nsIWebSocketListener.idl @@ -85,12 +85,6 @@ interface nsIWebSocketListener : nsISupports in unsigned short aCode, in AUTF8String aReason); - /** - * Called to inform an error is happened. The connection will be closed - * when this is called. - */ - [must_use] void OnError(); - };