Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: Source/modules/websockets/WebSocket.cpp

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/WebSocket.h ('k') | Source/modules/websockets/WebSocketChannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/WebSocket.cpp
diff --git a/Source/modules/websockets/WebSocket.cpp b/Source/modules/websockets/WebSocket.cpp
index 1452cae0b26a0db80fa64eb0c1105f44b6a38bc5..0cb9bfc11c09964e954ba5c0825f75e874208c98 100644
--- a/Source/modules/websockets/WebSocket.cpp
+++ b/Source/modules/websockets/WebSocket.cpp
@@ -585,14 +585,14 @@ void WebSocket::stop()
m_state = CLOSED;
}
-void WebSocket::didConnect()
+void WebSocket::didConnect(const String& subprotocol, const String& extensions)
{
WTF_LOG(Network, "WebSocket %p didConnect()", this);
if (m_state != CONNECTING)
return;
m_state = OPEN;
- m_subprotocol = m_channel->subprotocol();
- m_extensions = m_channel->extensions();
+ m_subprotocol = subprotocol;
+ m_extensions = extensions;
m_eventQueue->dispatch(Event::create(EventTypeNames::open));
}
« no previous file with comments | « Source/modules/websockets/WebSocket.h ('k') | Source/modules/websockets/WebSocketChannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698