Move ModuleInitializer::init out of initializeWithoutV8

third_party/WebKit/Source/web/WebKit.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 74 matching lines @@
 
 } // namespace
 
 static WebThread::TaskObserver* s_endOfTaskRunner = nullptr;
 static GCTaskRunner* s_gcTaskRunner = nullptr;
 
 // Make sure we are not re-initialized in the same address space.
 // Doing so may cause hard to reproduce crashes.
 static bool s_webKitInitialized = false;
 
+static ModulesInitializer& modulesInitializer()
+{
+    DEFINE_STATIC_LOCAL(OwnPtr<ModulesInitializer>, initializer, (adoptPtr(new ModulesInitializer)));
+    return *initializer;
+}
+
 void initialize(Platform* platform)
 {
     initializeWithoutV8(platform);
 
+    modulesInitializer().init();
+
+    setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);

[yhirano, 2016/03/08 07:05:24]

[optional] Can we move this function call to ModulesInitializer?

+
     V8Initializer::initializeMainThreadIfNeeded();
 
     OwnPtr<V8IsolateInterruptor> interruptor = adoptPtr(new V8IsolateInterruptor(V8PerIsolateData::mainThreadIsolate()));
     ThreadState::current()->addInterruptor(interruptor.release());
     ThreadState::current()->registerTraceDOMWrappers(V8PerIsolateData::mainThreadIsolate(), V8GCController::traceDOMWrappers);
 
     // currentThread is null if we are running on a thread without a message loop.
     if (WebThread* currentThread = platform->currentThread()) {
         ASSERT(!s_endOfTaskRunner);
         s_endOfTaskRunner = new EndOfTaskRunner;
@@ skipping 25 matching lines @@
 static void callOnMainThreadFunction(WTF::MainThreadFunction function, void* context)
 {
     Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(function, AllowCrossThreadAccess(context)));
 }
 
 static void adjustAmountOfExternalAllocatedMemory(int size)
 {
     v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(size);
 }
 
-static ModulesInitializer& modulesInitializer()
-{
-    DEFINE_STATIC_LOCAL(OwnPtr<ModulesInitializer>, initializer, (adoptPtr(new ModulesInitializer)));
-    return *initializer;
-}
-
 void initializeWithoutV8(Platform* platform)
 {
     ASSERT(!s_webKitInitialized);
     s_webKitInitialized = true;
 
     WTF::Partitions::initialize(maxObservedSizeFunction);
     ASSERT(platform);
     Platform::initialize(platform);
 
     WTF::initialize(adjustAmountOfExternalAllocatedMemory);
     WTF::initializeMainThread(callOnMainThreadFunction);
     Heap::init();
 
     ThreadState::attachMainThread();
     // currentThread() is null if we are running on a thread without a message loop.
     if (WebThread* currentThread = platform->currentThread()) {
         ASSERT(!s_gcTaskRunner);
         s_gcTaskRunner = new GCTaskRunner(currentThread);
     }
-
-    modulesInitializer().init();
-
-    setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
 }
 
 void shutdown()
 {
 #if defined(LEAK_SANITIZER)
     // If LSan is about to perform leak detection, release all the registered
     // static Persistent<> root references to global caches that Blink keeps,
     // followed by GCs to clear out all they referred to. A full v8 GC cycle
     // is needed to flush out all garbage.
     //
@@ skipping 22 matching lines @@
     // that this will wait the thread to stop its operations.
     ScriptStreamerThread::shutdown();
 
     ThreadState::current()->unregisterTraceDOMWrappers();
 
     v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
     V8PerIsolateData::willBeDestroyed(isolate);
 
     V8PerIsolateData::destroy(isolate);
 
+    modulesInitializer().shutdown();
+
     shutdownWithoutV8();
 }
 
 void shutdownWithoutV8()
 {
     ASSERT(isMainThread());
-    modulesInitializer().shutdown();
-
     // currentThread() is null if we are running on a thread without a message loop.
     if (Platform::current()->currentThread()) {
         ASSERT(s_gcTaskRunner);
         delete s_gcTaskRunner;
         s_gcTaskRunner = nullptr;
     }
 
     // Detach the main thread before starting the shutdown sequence
     // so that the main thread won't get involved in a GC during the shutdown.
     ThreadState::detachMainThread();
@@ skipping 58 matching lines @@
     ASSERT(!reloadPages);
     Page::refreshPlugins();
 }
 
 void decommitFreeableMemory()
 {
     WTF::Partitions::decommitFreeableMemory();
 }
 
 } // namespace blink