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

Unified Diff: Source/web/WebSocketImpl.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/web/WebSocketImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebSocketImpl.cpp
diff --git a/Source/web/WebSocketImpl.cpp b/Source/web/WebSocketImpl.cpp
index a83ba25326394e7a51e9478dbee80c0b17c33252..b8bd5fcfb7c7fb0e36cbceff3bc3bfc336fce2ec 100644
--- a/Source/web/WebSocketImpl.cpp
+++ b/Source/web/WebSocketImpl.cpp
@@ -85,12 +85,12 @@ void WebSocketImpl::connect(const WebURL& url, const WebString& protocol)
WebString WebSocketImpl::subprotocol()
{
- return m_private->subprotocol();
+ return m_subprotocol;
}
WebString WebSocketImpl::extensions()
{
- return m_private->extensions();
+ return m_extensions;
}
bool WebSocketImpl::sendText(const WebString& message)
@@ -124,8 +124,10 @@ void WebSocketImpl::disconnect()
m_client = 0;
}
-void WebSocketImpl::didConnect()
+void WebSocketImpl::didConnect(const String& subprotocol, const String& extensions)
{
+ m_subprotocol = subprotocol;
+ m_extensions = extensions;
m_client->didConnect();
}
« no previous file with comments | « Source/web/WebSocketImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698