Refactor module initialization.

Previous implementation had three CoreInitializer methods: initEventNames,
initEventTargetNames, and initBindings, which were never called, and
ModulesInitializer contained identically named methods which were a
superset of the base class implementation. This change removes duplication
and separates core and modules initialization for a cleaner implementation.

This change doesn't fix 393728, but is a necessary refactoring for the
actual fix.

BUG=393728

Review URL: https://codereview.chromium.org/464043002

git-svn-id: svn://svn.chromium.org/blink/trunk@180130 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/Init.cpp

@@ -57,16 +57,6 @@
 
 namespace blink {
 
-void CoreInitializer::initEventNames()
-{
-    EventNames::init();
-}
-
-void CoreInitializer::initEventTargetNames()
-{
-    EventTargetNames::init();
-}
-
 void CoreInitializer::registerEventFactory()
 {
     static bool isRegistered = false;
@@ -79,8 +69,7 @@ void CoreInitializer::registerEventFactory()
 
 void CoreInitializer::init()
 {
-    if (m_isInited)
-        return;
+    ASSERT(!m_isInited);
     m_isInited = true;
 
     // It would make logical sense to do this and WTF::StringStatics::init() in
@@ -93,8 +82,8 @@ void CoreInitializer::init()
     XMLNSNames::init();
     XMLNames::init();
 
-    initEventNames();
-    initEventTargetNames();
+    EventNames::init();
+    EventTargetNames::init();
     EventTypeNames::init();
     FetchInitiatorTypeNames::init();
     FontFamilyNames::init();
@@ -108,7 +97,6 @@ void CoreInitializer::init()
     Partitions::init();
     EventTracer::initialize();
 
-    initBindings();
     registerEventFactory();
 
     // Ensure that the main thread's thread-local data is initialized before

third_party/WebKit/Source/core/Init.h

@@ -37,17 +37,17 @@ class CoreInitializer {
 public:
     CoreInitializer() : m_isInited(false) { }
     // Should be called by clients before trying to create Frames.
-    void init();
-
-    virtual void registerEventFactory();
-    virtual void initEventNames();
-    virtual void initEventTargetNames();
-    virtual void initBindings() { }
+    virtual void init();
 
     // FIXME: Why is this function static?
     static void shutdown();
 
+protected:
+    bool isInitialized() const { return m_isInited; }
+
 private:
+    void registerEventFactory();
+
     bool m_isInited;
 };
 

third_party/WebKit/Source/modules/InitModules.cpp

@@ -14,27 +14,19 @@
 
 namespace blink {
 
-void ModulesInitializer::initEventNames()
+void ModulesInitializer::init()
 {
-    EventNames::init();
-    EventNames::initModules();
-}
+    ASSERT(!isInitialized());
 
-void ModulesInitializer::initEventTargetNames()
-{
-    EventTargetNames::init();
+    // Strings must be initialized before calling CoreInitializer::init().
+    EventNames::initModules();
     EventTargetNames::initModules();
-}
-
-void ModulesInitializer::registerEventFactory()
-{
-    CoreInitializer::registerEventFactory();
     Document::registerEventFactory(EventModulesFactory::create());
-}
-
-void ModulesInitializer::initBindings()
-{
     ModuleBindingsInitializer::init();
+
+    CoreInitializer::init();
+
+    ASSERT(isInitialized());
 }
 
 } // namespace blink

third_party/WebKit/Source/modules/InitModules.h

@@ -6,23 +6,14 @@
 #define InitModules_h
 
 #include "core/Init.h"
-#include "platform/heap/Handle.h"
 
 namespace blink {
 
-class Event;
-class ExceptionState;
-
 class ModulesInitializer : public CoreInitializer {
 public:
-    virtual void registerEventFactory() OVERRIDE;
-    virtual void initEventNames() OVERRIDE;
-    virtual void initEventTargetNames() OVERRIDE;
-    virtual void initBindings() OVERRIDE;
+    virtual void init() OVERRIDE;
 };
 
-PassRefPtrWillBeRawPtr<Event> createEventModules(const String& eventType, ExceptionState&);
-
 } // namespace blink
 
 #endif // InitModules_h