third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp - Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/

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: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3

Patch Set: get-names-4: Created 4 years, 10 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

« third_party/WebKit/Source/core/dom/Node.h ('K') | « third_party/WebKit/Source/modules/webaudio/AudioNode.cpp ('k') | third_party/WebKit/Source/web/ContextMenuClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

index d39635c9b0d7de2f3e1efba5ad26200d5073e2fb..5e7da6514f8b37b0628eab2c1496f67c2eba50d5 100644

--- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

+++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

@@ -282,7 +282,7 @@ void DOMWebSocket::connect(const String& url, const Vector<String>& protocols, E

WTF_LOG(Network, "WebSocket %p connect() url='%s'", this, url.utf8().data());

m_url = KURL(KURL(), url);

- if (executionContext()->securityContext().insecureRequestsPolicy() == SecurityContext::InsecureRequestsUpgrade && m_url.protocol() == "ws") {

+ if (executionContext()->securityContext().getInsecureRequestsPolicy() == SecurityContext::InsecureRequestsUpgrade && m_url.protocol() == "ws") {

UseCounter::count(executionContext(), UseCounter::UpgradeInsecureRequestsUpgradedRequest);

m_url.setProtocol("wss");

if (m_url.port() == 80)