Chromium Code Reviews| Index: Source/web/WebKit.cpp | 
| diff --git a/Source/web/WebKit.cpp b/Source/web/WebKit.cpp | 
| index 8398559c2c8b6766cdbd8e4994d4d210de0d2b21..105676103e8a2e27eb76ef6beab5d83fe89e899d 100644 | 
| --- a/Source/web/WebKit.cpp | 
| +++ b/Source/web/WebKit.cpp | 
| @@ -40,6 +40,7 @@ | 
| #include "core/page/Page.h" | 
| #include "core/workers/WorkerGlobalScopeProxy.h" | 
| #include "gin/public/v8_platform.h" | 
| +#include "modules/InitModules.h" | 
| #include "platform/LayoutTestSupport.h" | 
| #include "platform/Logging.h" | 
| #include "platform/graphics/ImageDecodingStore.h" | 
| @@ -167,7 +168,9 @@ void initializeWithoutV8(Platform* platform) | 
| s_messageLoopInterruptor = new WebCore::MessageLoopInterruptor(currentThread); | 
| WebCore::ThreadState::current()->addInterruptor(s_messageLoopInterruptor); | 
| } | 
| - WebCore::init(); | 
| + | 
| + DEFINE_STATIC_LOCAL(WebCore::ModulesInitializer, initializer, ()); | 
| 
 
eseidel
2014/05/19 21:44:23
So why can't we just call WebCore::init() and Modu
 
c.shu
2014/05/19 21:53:03
Thanks for the review, Eric. The problem was that
 
 | 
| + initializer.init(); | 
| // There are some code paths (for example, running WebKit in the browser | 
| // process and calling into LocalStorage before anything else) where the |