Replaced HTMLIdentifier with an atomized string factory function

Source/core/html/parser/HTMLParserIdioms.h

 /*
  * Copyright (C) 2010 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
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef HTMLParserIdioms_h
 #define HTMLParserIdioms_h
 
 #include "core/dom/QualifiedName.h"
-#include "core/html/parser/HTMLIdentifier.h"
 #include "platform/Decimal.h"
 #include "wtf/Forward.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 // Space characters as defined by the HTML specification.
 bool isHTMLSpace(UChar);
 bool isHTMLLineBreak(UChar);
 bool isNotHTMLSpace(UChar);
@@ skipping 51 matching lines @@
     return character <= '\r' && (character == '\n' || character == '\r');
 }
 
 template<typename CharType>
 inline bool isNotHTMLSpace(CharType character)
 {
     return !isHTMLSpace<CharType>(character);
 }
 
 bool threadSafeMatch(const QualifiedName&, const QualifiedName&);
-bool threadSafeMatch(const HTMLIdentifier&, const QualifiedName&);
-inline bool threadSafeHTMLNamesMatch(const HTMLIdentifier& tagName, const QualifiedName& qName)
+bool threadSafeMatch(const String&, const QualifiedName&);
+
+StringImpl* findAtomizedStringIfKnown(const UChar* characters, unsigned length);

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

findAtomizedStringIfKnown -> findStringIfStatic

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

Done.

+
+enum CharacterWidth {
+    Likely8Bit,
+    Force8Bit,
+    Force16Bit
+};
+
+template<size_t inlineCapacity>
+static String createAtomizedString(const Vector<UChar, inlineCapacity>& vector, CharacterWidth width)

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

createAtomizedString isn't a great name because it doesn't always atomize the
string.  Maybe createPotentiallyStaticString?  That's not a great name either...

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

attemptStaticStringCreation?

 {
-    // When the QualifiedName is known to HTMLIdentifier,
-    // all we have to do is a pointer compare.
-    ASSERT(HTMLIdentifier::isKnown(qName.localName().impl()));
-    return tagName.asStringImpl() == qName.localName().impl();
+    String string(findAtomizedStringIfKnown(vector.data(), vector.size()));
+    if (string.impl())
+        return string;
+    if (width == Likely8Bit)
+        string = StringImpl::create8BitIfPossible(vector);
+    else if (width == Force8Bit)
+        string = String::make8BitFrom16BitSource(vector);
+    else
+        string = String(vector);
+
+    return string;
 }
 
 }
-
 #endif