AtomicStringTable should not be initialized lazily

third_party/WebKit/Source/wtf/WTFThreadData.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "wtf/ThreadSpecific.h"
 #include "wtf/Threading.h"
 #include "wtf/WTFExport.h"
 #include "wtf/text/StringHash.h"
 
 namespace WTF {
 
 class AtomicStringTable;
 struct ICUConverterWrapper;
 
-typedef void (*AtomicStringTableDestructor)(AtomicStringTable*);
-
 class WTF_EXPORT WTFThreadData {
     WTF_MAKE_NONCOPYABLE(WTFThreadData);
 public:
     WTFThreadData();
     ~WTFThreadData();
 
+    static void createData();
+
     AtomicStringTable* atomicStringTable()
     {
         return m_atomicStringTable;
     }
 
     ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
 
 private:
     AtomicStringTable* m_atomicStringTable;
-    AtomicStringTableDestructor m_atomicStringTableDestructor;
     OwnPtr<ICUConverterWrapper> m_cachedConverterICU;
 
-    static ThreadSpecific<WTFThreadData>* staticData;
+    static ThreadSpecific<WTFThreadData>* s_staticData;
     friend WTFThreadData& wtfThreadData();
-    friend class AtomicStringTable;
 };
 
 inline WTFThreadData& wtfThreadData()
 {
-    // WRT WebCore:
-    //    WTFThreadData is used on main thread before it could possibly be used
-    //    on secondary ones, so there is no need for synchronization here.
-    // WRT JavaScriptCore:
-    //    wtfThreadData() is initially called from initializeThreading(), ensuring
-    //    this is initially called in a pthread_once locked context.
-    if (!WTFThreadData::staticData)
-        WTFThreadData::staticData = new ThreadSpecific<WTFThreadData>;
-    return **WTFThreadData::staticData;
+    ASSERT(WTFThreadData::s_staticData);
+    return **WTFThreadData::s_staticData;
 }
 
 } // namespace WTF
 
 using WTF::WTFThreadData;
 using WTF::wtfThreadData;
 
 #endif // WTFThreadData_h