Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: third_party/WebKit/Source/web/WebKit.cpp

Issue 1969673004: All worker threads should be joined before main thread's V8 isolate is destroyed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebKit.cpp
diff --git a/third_party/WebKit/Source/web/WebKit.cpp b/third_party/WebKit/Source/web/WebKit.cpp
index f0ac13e62a2b6599a8aee2b4310dc3223c05ec14..37c18d35ddbbb51b72fead7ed63f32202c923a0d 100644
--- a/third_party/WebKit/Source/web/WebKit.cpp
+++ b/third_party/WebKit/Source/web/WebKit.cpp
@@ -81,10 +81,10 @@ void initialize(Platform* platform)
{
Platform::initialize(platform);
- modulesInitializer().initialize();
-
V8Initializer::initializeMainThread();
+ modulesInitializer().initialize();
+
// currentThread is null if we are running on a thread without a message loop.
if (WebThread* currentThread = platform->currentThread()) {
DCHECK(!s_endOfTaskRunner);
@@ -106,10 +106,10 @@ void shutdown()
s_endOfTaskRunner = nullptr;
}
- V8Initializer::shutdownMainThread();
-
modulesInitializer().shutdown();
+ V8Initializer::shutdownMainThread();
+
Platform::shutdown();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698