Source/modules/websockets/WorkerThreadableWebSocketChannel.h - Issue 334873002: [WebSocket] Make subprotocol and extensions live in WebSocket

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 334873002: [WebSocket] Make subprotocol and extensions live in WebSocket (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

« no previous file with comments | « Source/modules/websockets/WebSocketTest.cpp ('k') | Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp » ('j') | Source/web/WebSocketImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.h

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

index 790339a2aac082e8b38c1a22571a75eec140fe29..7ff72e6cd9162ea4092fdf1ee330f38d26084a20 100644

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

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

@@ -73,8 +73,6 @@ public:

// WebSocketChannel functions.

virtual bool connect(const KURL&, const String& protocol) OVERRIDE;

- virtual String subprotocol() OVERRIDE;

- virtual String extensions() OVERRIDE;

virtual WebSocketChannel::SendResult send(const String& message) OVERRIDE;

virtual WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;

virtual WebSocketChannel::SendResult send(PassRefPtr<BlobDataHandle>) OVERRIDE;

@@ -117,7 +115,7 @@ public:

void resume();

// WebSocketChannelClient functions.

- virtual void didConnect() OVERRIDE;

+ virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;

virtual void didReceiveMessage(const String& message) OVERRIDE;

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

virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;