AtomicStringTable should not be initialized lazily

third_party/WebKit/Source/wtf/text/AtomicString.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "AtomicString.h"
 
 #include "StringHash.h"
-#include "wtf/HashSet.h"
 #include "wtf/WTFThreadData.h"
 #include "wtf/dtoa.h"
 #include "wtf/text/IntegerToStringConversion.h"
 #include "wtf/text/UTF8.h"
 
 namespace WTF {
 
 using namespace Unicode;
 
 static_assert(sizeof(AtomicString) == sizeof(String), "AtomicString and String must be same size");
 
-class AtomicStringTable {
-    WTF_MAKE_NONCOPYABLE(AtomicStringTable);
-public:
-    static AtomicStringTable* create(WTFThreadData& data)
-    {
-        data.m_atomicStringTable = new AtomicStringTable;
-        data.m_atomicStringTableDestructor = AtomicStringTable::destroy;
-        data.m_atomicStringTable->addStaticStrings();
-        return data.m_atomicStringTable;
+StringImpl* AtomicStringTable::addStringImpl(StringImpl* string)
+{
+    if (!string->length())
+        return StringImpl::empty();
+
+    StringImpl* result = *m_table.add(string).storedValue;
+
+    if (!result->isAtomic())
+        result->setIsAtomic(true);
+
+    ASSERT(!string->isStatic() || result->isStatic());
+    return result;
+}
+
+AtomicStringTable* AtomicStringTable::create()
+{
+    AtomicStringTable* table = new AtomicStringTable;
+    const StaticStringsTable& staticStrings = StringImpl::allStaticStrings();
+    for (auto it = staticStrings.begin(); it != staticStrings.end(); ++it) {
+        table->addStringImpl(it->value);
     }
+    return table;
+}
 
-    StringImpl* addStringImpl(StringImpl* string)
-    {
-        if (!string->length())
-            return StringImpl::empty();
-
-        StringImpl* result = *m_table.add(string).storedValue;
-
-        if (!result->isAtomic())
-            result->setIsAtomic(true);
-
-        ASSERT(!string->isStatic() || result->isStatic());
-        return result;
-    }
-
-    HashSet<StringImpl*>& table()
-    {
-        return m_table;
-    }
-
-private:
-    AtomicStringTable() { }
-
-    void addStaticStrings()
-    {
-        const StaticStringsTable& staticStrings = StringImpl::allStaticStrings();
-
-        StaticStringsTable::const_iterator it = staticStrings.begin();
-        for (; it != staticStrings.end(); ++it) {
-            addStringImpl(it->value);
+void AtomicStringTable::destroy(AtomicStringTable* table)
+{
+    for (StringImpl* string : table->table()) {
+        if (!string->isStatic()) {
+            ASSERT(string->isAtomic());
+            string->setIsAtomic(false);
         }
     }
+    delete table;
+}
 
-    static void destroy(AtomicStringTable* table)
-    {
-        HashSet<StringImpl*>::iterator end = table->m_table.end();
-        for (HashSet<StringImpl*>::iterator iter = table->m_table.begin(); iter != end; ++iter) {
-            StringImpl* string = *iter;
-            if (!string->isStatic()) {
-                ASSERT(string->isAtomic());
-                string->setIsAtomic(false);
-            }
-        }
-        delete table;
-    }
-
-    HashSet<StringImpl*> m_table;
-};
-
-static inline AtomicStringTable& atomicStringTable()
+static inline AtomicStringTable* atomicStringTable()
 {
-    // Once possible we should make this non-lazy (constructed in WTFThreadData's constructor).
     WTFThreadData& data = wtfThreadData();
     AtomicStringTable* table = data.atomicStringTable();
-    if (UNLIKELY(!table))
-        table = AtomicStringTable::create(data);
-    return *table;
+    ASSERT(table);
+    return table;
 }
 
 static inline HashSet<StringImpl*>& atomicStrings()
 {
-    return atomicStringTable().table();
+    return atomicStringTable()->table();
 }
 
 template<typename T, typename HashTranslator>
 static inline PassRefPtr<StringImpl> addToStringTable(const T& value)
 {
     HashSet<StringImpl*>::AddResult addResult = atomicStrings().add<HashTranslator>(value);
 
     // If the string is newly-translated, then we need to adopt it.
     // The boolean in the pair tells us if that is so.
     return addResult.isNewEntry ? adoptRef(*addResult.storedValue) : *addResult.storedValue;
@@ skipping 277 matching lines @@
 {
     ASSERT(characters);
     ASSERT(length);
 
     CharBuffer buffer = { characters, length };
     return addToStringTable<CharBuffer, CharBufferFromLiteralDataTranslator>(buffer);
 }
 
 PassRefPtr<StringImpl> AtomicString::addSlowCase(StringImpl* string)
 {
-    return atomicStringTable().addStringImpl(string);
+    return atomicStringTable()->addStringImpl(string);
 }
 
 template<typename CharacterType>
 static inline HashSet<StringImpl*>::iterator findString(const StringImpl* stringImpl)
 {
     HashAndCharacters<CharacterType> buffer = { stringImpl->existingHash(), stringImpl->getCharacters<CharacterType>(), stringImpl->length() };
     return atomicStrings().find<HashAndCharactersTranslator<CharacterType>>(buffer);
 }
 
 StringImpl* AtomicString::find(const StringImpl* stringImpl)
@@ skipping 88 matching lines @@
 }
 
 #ifndef NDEBUG
 void AtomicString::show() const
 {
     m_string.show();
 }
 #endif
 
 } // namespace WTF