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

Unified Diff: Source/core/Init.cpp

Issue 297493004: Move modules-dependent eventtarget code out of core. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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: 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();
« no previous file with comments | « Source/core/Init.h ('k') | Source/core/core.gyp » ('j') | Source/web/WebKit.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698