Stop using static arrays for *Tags / *Attrs

Source/core/html/parser/HTMLIdentifier.cpp

 /*
  * Copyright (C) 2013 Google, 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 58 matching lines @@
         return 0;
     // It's possible to have hash collisions between arbitrary strings and
     // known identifiers (e.g. "bvvfg" collides with "script").
     // However ASSERTs in addNames() guard against there ever being collisions
     // between known identifiers.
     if (!equal(it->value, characters, length))
         return 0;
     return it->value;
 }
 
-const unsigned kHTMLNamesIndexOffset = 0;

[Inactive, 2013/10/30 18:35:36]

These constants were passed to HTMLIdentifier::addNames() but not used by that
method.

[abarth-chromium, 2013/10/30 19:30:11]

Yeah, this was old tech before we had thread-safe strings.  Thanks for the
cleanup.

-const unsigned kHTMLAttrsIndexOffset = 1000;
-COMPILE_ASSERT(kHTMLAttrsIndexOffset > HTMLTagsCount, kHTMLAttrsIndexOffset_should_be_larger_than_HTMLTagsCount);
-
 const String& HTMLIdentifier::asString() const
 {
     ASSERT(isMainThread());
     return m_string;
 }
 
 const StringImpl* HTMLIdentifier::asStringImpl() const
 {
     return m_string.impl();
 }
 
-void HTMLIdentifier::addNames(const QualifiedName* const* names, unsigned namesCount, unsigned indexOffset)
+void HTMLIdentifier::addNames(const Vector<const QualifiedName*>& names)
 {
     IdentifierTable& table = identifierTable();
-    for (unsigned i = 0; i < namesCount; ++i) {
+    size_t namesCount = names.size();
+    for (size_t i = 0; i < namesCount; ++i) {
         StringImpl* name = names[i]->localName().impl();
         unsigned hash = name->hash();
         IdentifierTable::AddResult addResult = table.add(hash, name);
         maxNameLength = std::max(maxNameLength, name->length());
         // Ensure we're using the same hashing algorithm to get and set.
         ASSERT_UNUSED(addResult, !addResult.isNewEntry || HTMLIdentifier::findIfKnown(String(name).charactersWithNullTermination().data(), name->length()) == name);
         // We expect some hash collisions, but only for identical strings.
         // Since all of these names are AtomicStrings pointers should be equal.
         // Note: If you hit this ASSERT, then we had a hash collision among
         // HTMLNames strings, and we need to re-design how we use this hash!
         ASSERT_UNUSED(addResult, !addResult.isNewEntry || name == addResult.iterator->value);
     }
 }
 
 void HTMLIdentifier::init()
 {
     ASSERT(isMainThread()); // Not technically necessary, but this is our current expected usage.
     static bool isInitialized = false;
     if (isInitialized)
         return;
     isInitialized = true;
 
     // FIXME: We should atomize small whitespace (\n, \n\n, etc.)
-    addNames(getHTMLTags(), HTMLTagsCount, kHTMLNamesIndexOffset);
-    addNames(getHTMLAttrs(), HTMLAttrsCount, kHTMLAttrsIndexOffset);
+    Vector<const QualifiedName*> HTMLTags;
+    getHTMLTags(HTMLTags);
+    addNames(HTMLTags);
+    Vector<const QualifiedName*> HTMLAttrs;
+    getHTMLAttrs(HTMLAttrs);
+    addNames(HTMLAttrs);
 }
 
 }