Replaced HTMLIdentifier with an atomized string factory function

Source/core/html/parser/CompactHTMLToken.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 15 matching lines @@
 #include "config.h"
 #include "core/html/parser/CompactHTMLToken.h"
 
 #include "core/dom/QualifiedName.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 
 namespace WebCore {
 
 struct SameSizeAsCompactHTMLToken  {
     unsigned bitfields;
-    HTMLIdentifier data;
+    String data;
     Vector<Attribute> vector;
     TextPosition textPosition;
 };
 
 COMPILE_ASSERT(sizeof(CompactHTMLToken) == sizeof(SameSizeAsCompactHTMLToken), CompactHTMLToken_should_stay_small);
 
 CompactHTMLToken::CompactHTMLToken(const HTMLToken* token, const TextPosition& textPosition)
     : m_type(token->type())
     , m_isAll8BitData(false)
     , m_doctypeForcesQuirks(false)
     , m_textPosition(textPosition)
 {
     switch (m_type) {
     case HTMLToken::Uninitialized:
         ASSERT_NOT_REACHED();
         break;
     case HTMLToken::DOCTYPE: {
-        m_data = HTMLIdentifier(token->name(), Likely8Bit);
+        m_data = attemptStaticStringCreation(token->name(), Likely8Bit);
+
         // There is only 1 DOCTYPE token per document, so to avoid increasing the
         // size of CompactHTMLToken, we just use the m_attributes vector.
-        m_attributes.append(Attribute(HTMLIdentifier(token->publicIdentifier(), Likely8Bit), String(token->systemIdentifier())));
+        m_attributes.append(Attribute(attemptStaticStringCreation(token->publicIdentifier(), Likely8Bit), String(token->systemIdentifier())));
         m_doctypeForcesQuirks = token->forceQuirks();
         break;
     }
     case HTMLToken::EndOfFile:
         break;
     case HTMLToken::StartTag:
         m_attributes.reserveInitialCapacity(token->attributes().size());
         for (Vector<HTMLToken::Attribute>::const_iterator it = token->attributes().begin(); it != token->attributes().end(); ++it)
-            m_attributes.append(Attribute(HTMLIdentifier(it->name, Likely8Bit), StringImpl::create8BitIfPossible(it->value)));
+            m_attributes.append(Attribute(attemptStaticStringCreation(it->name, Likely8Bit), StringImpl::create8BitIfPossible(it->value)));
         // Fall through!
     case HTMLToken::EndTag:
         m_selfClosing = token->selfClosing();
         // Fall through!
     case HTMLToken::Comment:
     case HTMLToken::Character: {
         m_isAll8BitData = token->isAll8BitData();
-        m_data = HTMLIdentifier(token->data(), token->isAll8BitData() ? Force8Bit : Force16Bit);
+        m_data = attemptStaticStringCreation(token->data(), token->isAll8BitData() ? Force8Bit : Force16Bit);
         break;
     }
     default:
         ASSERT_NOT_REACHED();
         break;
     }
 }
 
 const CompactHTMLToken::Attribute* CompactHTMLToken::getAttributeItem(const QualifiedName& name) const
 {
     for (unsigned i = 0; i < m_attributes.size(); ++i) {
         if (threadSafeMatch(m_attributes.at(i).name, name))
             return &m_attributes.at(i);
     }
     return 0;
 }
 
 bool CompactHTMLToken::isSafeToSendToAnotherThread() const
 {
     for (Vector<Attribute>::const_iterator it = m_attributes.begin(); it != m_attributes.end(); ++it) {
         if (!it->name.isSafeToSendToAnotherThread())
             return false;
         if (!it->value.isSafeToSendToAnotherThread())
             return false;
     }
     return m_data.isSafeToSendToAnotherThread();
 }
 
 }