Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h - Issue 311993006: [WebSocket] bufferedAmount should not decrease inside a task.

Unified Diff: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

Issue 311993006: [WebSocket] bufferedAmount should not decrease inside a task. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/modules/websockets/MainThreadWebSocketChannel.cpp ('K') | « Source/modules/websockets/NewWebSocketChannelImpl.cpp ('k') | Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp » ('j') | Source/modules/websockets/WebSocket.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

diff --git a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

index aec573073d7b6c121c87de37665a4323b29fdf31..db1cf167c9462c8806db752dfeff32fc957b98ac 100644

--- a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

+++ b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h

@@ -61,9 +61,9 @@ public:

void didConnect();

void didReceiveMessage(const String& message);

void didReceiveBinaryData(PassOwnPtr<Vector<char> >);

- void didUpdateBufferedAmount(unsigned long bufferedAmount);

+ void didConsumeBufferedAmount(unsigned long);

void didStartClosingHandshake();

- void didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);

+ void didClose(WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);

void didReceiveMessageError();

void suspend();

@@ -79,9 +79,9 @@ private:

static void didConnectCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);

static void didReceiveMessageCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, const String& message);

static void didReceiveBinaryDataCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, PassOwnPtr<Vector<char> >);

- static void didUpdateBufferedAmountCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long bufferedAmount);

+ static void didConsumeBufferedAmountCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long);

static void didStartClosingHandshakeCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);

- static void didCloseCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);

+ static void didCloseCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);

static void didReceiveMessageErrorCallback(ExecutionContext*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);

WebSocketChannelClient* m_client;