Changeset 59172 in webkit for trunk/JavaScriptCore/wtf/text/AtomicString.cpp

Timestamp:

May 11, 2010, 2:35:39 PM (15 years ago)

Author:

[email protected]

Message:

2010-05-11 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r59171.
​http://trac.webkit.org/changeset/59171
​https://bugs.webkit.org/show_bug.cgi?id=38933

"Broke the world" (Requested by bweinstein on #webkit).

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.vcproj/jsc/jsc.vcproj:
• JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
• JavaScriptCore.xcodeproj/project.pbxproj:
• wtf/text/AtomicString.cpp: (WebCore::AtomicString::init):
• wtf/text/StringImpl.cpp: (WebCore::StringImpl::empty):
• wtf/text/StringStatics.cpp: Removed.

2010-05-11 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r59171.
​http://trac.webkit.org/changeset/59171
​https://bugs.webkit.org/show_bug.cgi?id=38933

"Broke the world" (Requested by bweinstein on #webkit).

• WebCore.vcproj/WebCore.vcproj:

File:

• trunk/JavaScriptCore/wtf/text/AtomicString.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wtf/text/AtomicString.cpp

@@ -21 +21 @@
 #include "config.h"
 
+#ifdef SKIP_STATIC_CONSTRUCTORS_ON_GCC
+#define ATOMICSTRING_HIDE_GLOBALS 1
+#endif
+
 #include "AtomicString.h"
 
+#include "StaticConstructors.h"
 #include "StringHash.h"
 #include <wtf/HashSet.h>
@@ -295 +300 @@
 }
 
-}
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom)
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom, "")
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom, "#text")
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom, "#comment")
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom, "*")
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom, "xml")
+JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom, "xmlns")
+
+void AtomicString::init()
+{
+    static bool initialized;
+    if (!initialized) {
+        // Initialization is not thread safe, so this function must be called from the main thread first.
+        ASSERT(isMainThread());
+
+        // Use placement new to initialize the globals.
+        new ((void*)&nullAtom) AtomicString;
+        new ((void*)&emptyAtom) AtomicString("");
+        new ((void*)&textAtom) AtomicString("#text");
+        new ((void*)&commentAtom) AtomicString("#comment");
+        new ((void*)&starAtom) AtomicString("*");
+        new ((void*)&xmlAtom) AtomicString("xml");
+        new ((void*)&xmlnsAtom) AtomicString("xmlns");
+
+        initialized = true;
+    }
+}
+
+}