Replaced HTMLIdentifier with an atomized string factory function

Source/wtf/text/StringImpl.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller ( mueller@kde.org )
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  *
  * 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
@@ skipping 340 matching lines @@
     // Same as createUninitialized() except here we use realloc.
     RELEASE_ASSERT(length <= ((std::numeric_limits<unsigned>::max() - sizeof(StringImpl)) / sizeof(UChar)));
     size_t size = sizeof(StringImpl) + length * sizeof(UChar);
     originalString->~StringImpl();
     StringImpl* string = static_cast<StringImpl*>(partitionReallocGeneric(Partitions::getBufferPartition(), originalString.leakRef(), size));
 
     data = reinterpret_cast<UChar*>(string + 1);
     return adoptRef(new (string) StringImpl(length));
 }
 
-static Vector<StringImpl*>& staticStrings()
+static StaticStringsTable& staticStrings()
 {
-    DEFINE_STATIC_LOCAL(Vector<StringImpl*>, staticStrings, ());
+    DEFINE_STATIC_LOCAL(StaticStringsTable, staticStrings, ());
     return staticStrings;
 }
 
 #ifndef NDEBUG
 static bool s_allowCreationOfStaticStrings = true;
 #endif
 
-const Vector<StringImpl*>& StringImpl::allStaticStrings()
+const StaticStringsTable& StringImpl::allStaticStrings()
 {
     return staticStrings();
 }
 
 void StringImpl::freezeStaticStrings()
 {
     ASSERT(isMainThread());
 
 #ifndef NDEBUG
     s_allowCreationOfStaticStrings = false;
 #endif
+}
 
-    staticStrings().shrinkToFit();
-}
+unsigned StringImpl::m_highestStaticStringLength = 0;
 
 StringImpl* StringImpl::createStatic(const char* string, unsigned length, unsigned hash)
 {
     ASSERT(s_allowCreationOfStaticStrings);
     ASSERT(string);
     ASSERT(length);
 
     // Allocate a single buffer large enough to contain the StringImpl
     // struct as well as the data which it contains. This removes one
     // heap allocation from this call.
     RELEASE_ASSERT(length <= ((std::numeric_limits<unsigned>::max() - sizeof(StringImpl)) / sizeof(LChar)));
     size_t size = sizeof(StringImpl) + length * sizeof(LChar);
     WTF_ANNOTATE_SCOPED_MEMORY_LEAK;
     StringImpl* impl = static_cast<StringImpl*>(partitionAllocGeneric(Partitions::getBufferPartition(), size));
 
     LChar* data = reinterpret_cast<LChar*>(impl + 1);
     impl = new (impl) StringImpl(length, hash, StaticString);
     memcpy(data, string, length * sizeof(LChar));
 #ifndef NDEBUG
     impl->assertHashIsCorrect();
 #endif
 
     ASSERT(isMainThread());
-    staticStrings().append(impl);
+    m_highestStaticStringLength = std::max(m_highestStaticStringLength, length);
+    staticStrings().add(hash, impl);

[abarth-chromium, 2013/12/10 04:48:23]

Can you ASSERT that this hash isn't already in the table?  We used to have that
assert and it's important for correctness.

[oystein (OOO til 10th of July), 2013/12/10 18:42:27]

There were actually some duplicates here (SVGNames added "a", I'm guessing
HTMLNames did the same). I added a lookup so they'll be always unique (and an
assert to ensure the actual string also matches).

     WTF_ANNOTATE_BENIGN_RACE(impl,
         "Benign race on the reference counter of a static string created by StringImpl::createStatic");
 
     return impl;
 }
 
 PassRefPtr<StringImpl> StringImpl::create(const UChar* characters, unsigned length)
 {
     if (!characters || !length)
         return empty();
@@ skipping 1663 matching lines @@
 
 size_t StringImpl::sizeInBytes() const
 {
     size_t size = length();
     if (!is8Bit())
         size *= 2;
     return size + sizeof(*this);
 }
 
 } // namespace WTF