third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.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/core/workers/InProcessWorkerMessagingProxy.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/core/workers/DedicatedWorkerThread.cpp ('k') | third_party/WebKit/Source/core/workers/InProcessWorkerObjectProxy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.cpp

diff --git a/third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.cpp b/third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.cpp

index 7f39c1ba9c385fa58b90fab98d56d470d679d4d7..edf0372c9fc08224d6a4d0ca7074cd8a39e896e2 100644

--- a/third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.cpp

+++ b/third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.cpp

@@ -122,7 +122,7 @@ void InProcessWorkerMessagingProxy::startWorkerGlobalScope(

WorkerThreadStartMode startMode =

workerInspectorProxy()->workerStartMode(document);

std::unique_ptr<WorkerSettings> workerSettings =

- wrapUnique(new WorkerSettings(document->settings()));

+ WTF::wrapUnique(new WorkerSettings(document->settings()));

std::unique_ptr<WorkerThreadStartupData> startupData =

WorkerThreadStartupData::create(

scriptURL, userAgent, sourceCode, nullptr, startMode,

@@ -158,7 +158,8 @@ void InProcessWorkerMessagingProxy::postMessageToWorkerGlobalScope(

std::unique_ptr<ExecutionContextTask> task = createCrossThreadTask(

&processMessageOnWorkerGlobalScope, std::move(message),

- passed(std::move(channels)), crossThreadUnretained(&workerObjectProxy()));

+ WTF::passed(std::move(channels)),

+ crossThreadUnretained(&workerObjectProxy()));

if (workerThread()) {

// A message event is an activity and may initiate another activity.

m_workerGlobalScopeHasPendingActivity = true;