third_party/WebKit/Source/modules/websockets/WebSocketHandleImpl.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

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/WebSocketHandleImpl.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 years 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 | « third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp ('k') | third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5a0d72efc2dbb720f2093bcb0996151cc66731f9..ee031e1552b869c0274218eafad5a1d2a5c856eb 100644

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

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

@@ -42,8 +42,9 @@ void WebSocketHandleImpl::initialize(InterfaceProvider* interfaceProvider) {

DCHECK(!m_websocket);

interfaceProvider->getInterface(mojo::GetProxy(&m_websocket));

- m_websocket.set_connection_error_with_reason_handler(convertToBaseCallback(

- WTF::bind(&WebSocketHandleImpl::onConnectionError, unretained(this))));

+ m_websocket.set_connection_error_with_reason_handler(

+ convertToBaseCallback(WTF::bind(&WebSocketHandleImpl::onConnectionError,

+ WTF::unretained(this))));

}

void WebSocketHandleImpl::connect(const KURL& url,