third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.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/DocumentWebSocketChannel.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/webmidi/MIDIAccessor.cpp ('k') | third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannelTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 95c0ded764028caec622a5dee76bd01b8675ae98..c37df640d024e168b65677827a3d06df3a569ed9 100644

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

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

@@ -131,7 +131,7 @@ DocumentWebSocketChannel::DocumentWebSocketChannel(

WebSocketChannelClient* client,

std::unique_ptr<SourceLocation> location,

WebSocketHandle* handle)

- : m_handle(wrapUnique(handle ? handle : new WebSocketHandleImpl())),

+ : m_handle(WTF::wrapUnique(handle ? handle : new WebSocketHandleImpl())),

m_client(client),

m_identifier(createUniqueIdentifier()),

m_document(document),

@@ -568,7 +568,8 @@ void DocumentWebSocketChannel::didReceiveData(WebSocketHandle* handle,

m_client->didReceiveTextMessage(message);

}

} else {

- std::unique_ptr<Vector<char>> binaryData = wrapUnique(new Vector<char>);

+ std::unique_ptr<Vector<char>> binaryData =

+ WTF::wrapUnique(new Vector<char>);

binaryData->swap(m_receivingMessageData);

m_client->didReceiveBinaryMessage(std::move(binaryData));

}