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

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

Issue 201593002: Add WebSerializedOrigin to represent a serialized Web Origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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 | « no previous file | Source/platform/blink_platform.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/NewWebSocketChannelImpl.cpp
diff --git a/Source/modules/websockets/NewWebSocketChannelImpl.cpp b/Source/modules/websockets/NewWebSocketChannelImpl.cpp
index 1c23e48d7cc0bb8e30d74da5e36a55676654a3cb..9a190b9b31890413b8d719532d9b15fd7b514a4d 100644
--- a/Source/modules/websockets/NewWebSocketChannelImpl.cpp
+++ b/Source/modules/websockets/NewWebSocketChannelImpl.cpp
@@ -43,6 +43,7 @@
#include "platform/network/WebSocketHandshakeRequest.h"
#include "platform/weborigin/SecurityOrigin.h"
#include "public/platform/Platform.h"
+#include "public/platform/WebSerializedOrigin.h"
#include "public/platform/WebSocketHandshakeRequestInfo.h"
#include "public/platform/WebSocketHandshakeResponseInfo.h"
#include "public/platform/WebString.h"
@@ -136,8 +137,7 @@ void NewWebSocketChannelImpl::connect(const KURL& url, const String& protocol)
for (size_t i = 0; i < protocols.size(); ++i) {
webProtocols[i] = protocols[i];
}
- String origin = executionContext()->securityOrigin()->toString();
- m_handle->connect(url, webProtocols, origin, this);
+ m_handle->connect(url, webProtocols, *executionContext()->securityOrigin(), this);
flowControlIfNecessary();
if (m_identifier)
InspectorInstrumentation::didCreateWebSocket(document(), m_identifier, url, protocol);
« no previous file with comments | « no previous file | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698