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

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

Issue 2402983002: [TimeZoneMonitor] Decouple renderer side impl from content to blink. (Closed)
Patch Set: Rebase only Created 4 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:
View side-by-side diff with in-line comments
Download patch
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 f32df4dfb71b7c477d397c31330b30e5a1b087a8..384d9adbe1f8645d646dd613ab2f1f0646363537 100644
--- a/third_party/WebKit/Source/web/WebKit.cpp
+++ b/third_party/WebKit/Source/web/WebKit.cpp
@@ -82,6 +82,12 @@ void initialize(Platform* platform) {
modulesInitializer().initialize();
+ // Some unit tests may have no message loop ready, so we can't initialize the
+ // mojo stuff here. They can initialize those mojo stuff they're interested in
+ // later after they got a message loop ready.
+ if (Platform::isMessageLoopReady())
+ modulesInitializer().initializeMojo();
haraken 2016/10/26 11:21:59 Can we move this into modulesInitializer().initial
leonhsl(Using Gerrit) 2016/10/26 11:45:48 Acknowledged.
leonhsl(Using Gerrit) 2016/10/27 05:01:27 Done.
+
// currentThread is null if we are running on a thread without a message loop.
if (WebThread* currentThread = platform->currentThread()) {
DCHECK(!s_endOfTaskRunner);

Powered by Google App Engine
This is Rietveld 408576698