Source/web/WebEmbeddedWorkerImpl.cpp - Issue 684223004: ServiceWorker: Fix data race in shutdown sequence

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: Source/web/WebEmbeddedWorkerImpl.cpp

Issue 684223004: ServiceWorker: Fix data race in shutdown sequence (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 2 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:

Index: Source/web/WebEmbeddedWorkerImpl.cpp

diff --git a/Source/web/WebEmbeddedWorkerImpl.cpp b/Source/web/WebEmbeddedWorkerImpl.cpp

index f9cdbfde727cf76e5b46101e44ee129882f6fdd9..24a2327033df1285e3e2da989832efe0c811ef32 100644

--- a/Source/web/WebEmbeddedWorkerImpl.cpp

+++ b/Source/web/WebEmbeddedWorkerImpl.cpp

@@ -171,6 +171,9 @@ WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(

WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()

{

+ if (m_workerThread)

+ m_workerThread->terminateAndWait();

ASSERT(runningWorkerInstances().contains(this));

runningWorkerInstances().remove(this);

ASSERT(m_webView);