Index: Source/core/Init.cpp |
diff --git a/Source/core/Init.cpp b/Source/core/Init.cpp |
index ab9f2f9fb95f4084eef0969b201cbfd92eaf14a2..c91540e069585abdaa7ca8f1cc80bbc7b2192499 100644 |
--- a/Source/core/Init.cpp |
+++ b/Source/core/Init.cpp |
@@ -32,7 +32,6 @@ |
#include "Init.h" |
#include "EventNames.h" |
-#include "EventTargetModulesNames.h" |
#include "EventTargetNames.h" |
#include "EventTypeNames.h" |
#include "FetchInitiatorTypeNames.h" |
@@ -56,12 +55,16 @@ |
namespace WebCore { |
-void init() |
+void CoreInitializer::initEventTargetNames() |
{ |
- static bool isInited; |
- if (isInited) |
+ EventTargetNames::init(); |
+} |
+ |
+void CoreInitializer::init() |
+{ |
+ if (m_isInited) |
return; |
- isInited = true; |
+ m_isInited = true; |
// It would make logical sense to do this and WTF::StringStatics::init() in |
// WTF::initialize() but there are ordering dependencies. |
@@ -74,8 +77,7 @@ void init() |
XMLNames::init(); |
EventNames::init(); |
- EventTargetNames::init(); |
- EventTargetNames::initModules(); // TODO: remove this later http://crbug.com/371581. |
+ initEventTargetNames(); |
EventTypeNames::init(); |
FetchInitiatorTypeNames::init(); |
FontFamilyNames::init(); |