third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp - Issue 2288983004: Merge TaskSynchronizer into WaitableEvent.

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

Issue 2288983004: Merge TaskSynchronizer into WaitableEvent. (Closed)

Patch Set: fix Created 4 years, 4 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 | « third_party/WebKit/Source/modules/webdatabase/DatabaseThread.cpp ('k') | third_party/WebKit/Source/platform/TaskSynchronizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3ab95c223117a3152fc38e40bc7347f152a193a4..a774cda0c5d7cc5d5cef12c1621c4c9c6bc8ae04 100644

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

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

@@ -388,10 +388,7 @@ bool Bridge::connect(std::unique_ptr<SourceLocation> location, const KURL& url,

// content check must synchronously be conducted.

WebSocketChannelSyncHelper syncHelper;

m_loaderProxy->postTaskToLoader(BLINK_FROM_HERE, createCrossThreadTask(&Bridge::connectOnMainThread, wrapCrossThreadPersistent(this), passed(location->clone()), wrapCrossThreadPersistent(m_workerGlobalScope->thread()->getWorkerThreadLifecycleContext()), url, protocol, crossThreadUnretained(&syncHelper)));

- {

- SafePointScope scope(BlinkGC::HeapPointersOnStack);

- syncHelper.wait();

- }

+ syncHelper.wait();

return syncHelper.connectRequestResult();

}