third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp - Issue 1761853002: Shut down all threads before the main thread shuts down

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/webdatabase/DatabaseManager.cpp

Issue 1761853002: Shut down all threads before the main thread shuts down (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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/InitModules.cpp ('k') | third_party/WebKit/Source/platform/heap/ThreadState.h » ('j') | third_party/WebKit/Source/web/WebKit.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp

diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp

index 060dfc515eb5bd610645cfb1ce8f456a002af07b..6cd258b7248650cc948c7818b9ad17ec035878b8 100644

--- a/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp

+++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp

@@ -56,9 +56,9 @@ DatabaseManager& DatabaseManager::manager()

void DatabaseManager::terminateDatabaseThread()

{

- ASSERT(isMainThread());

if (!s_databaseManager)

return;

+ ASSERT(isMainThread());

haraken 2016/03/03 12:08:46 I moved this check because after this CL, shutdown

for (const Member<DatabaseContext>& context : s_databaseManager->m_contextMap.values())

context->stopDatabases();

}