Replace character vectors with StringBuilders in the WebVTT tokenizer

Source/core/html/track/vtt/VTTParser.cpp

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 488 matching lines @@
     int value4 = digits4.toInt();
     if (value2 > 59 || value3 > 59)
         return malformedTime;
 
     // Steps 18 - 19 - Calculate result.
     return (value1 * secondsPerHour) + (value2 * secondsPerMinute) + value3 + (value4 * secondsPerMillisecond);
 }
 
 static VTTNodeType tokenToNodeType(VTTToken& token)
 {
-    switch (token.name().size()) {
+    switch (token.name().length()) {
     case 1:
         if (token.name()[0] == 'c')
             return VTTNodeTypeClass;
         if (token.name()[0] == 'v')
             return VTTNodeTypeVoice;
         if (token.name()[0] == 'b')
             return VTTNodeTypeBold;
         if (token.name()[0] == 'i')
             return VTTNodeTypeItalic;
         if (token.name()[0] == 'u')
             return VTTNodeTypeUnderline;
         break;
     case 2:
         if (token.name()[0] == 'r' && token.name()[1] == 't')
             return VTTNodeTypeRubyText;
         break;
     case 4:
         if (token.name()[0] == 'r' && token.name()[1] == 'u' && token.name()[2] == 'b' && token.name()[3] == 'y')
             return VTTNodeTypeRuby;
         if (token.name()[0] == 'l' && token.name()[1] == 'a' && token.name()[2] == 'n' && token.name()[3] == 'g')
             return VTTNodeTypeLanguage;
         break;
     }
     return VTTNodeTypeNone;
 }
 
 void VTTTreeBuilder::constructTreeFromToken(Document& document)
 {
-    QualifiedName tagName(nullAtom, AtomicString(m_token.name()), xhtmlNamespaceURI);
-
     // http://dev.w3.org/html5/webvtt/#webvtt-cue-text-dom-construction-rules
 
     switch (m_token.type()) {
     case VTTTokenTypes::Character: {
-        String content(m_token.characters()); // FIXME: This should be 8bit if possible.
+        String content = m_token.characters().toString();
         RefPtr<Text> child = Text::create(document, content);
         m_currentNode->parserAppendChild(child);
         break;
     }
     case VTTTokenTypes::StartTag: {
         RefPtr<VTTElement> child;
         VTTNodeType nodeType = tokenToNodeType(m_token);
         if (nodeType != VTTNodeTypeNone)
             child = VTTElement::create(nodeType, &document);
         if (child) {
-            if (m_token.classes().size() > 0)
-                child->setAttribute(classAttr, AtomicString(m_token.classes()));
+            if (!m_token.classes().isEmpty())
+                child->setAttribute(classAttr, m_token.classes().toAtomicString());
 
             if (child->webVTTNodeType() == VTTNodeTypeVoice) {
-                child->setAttribute(VTTElement::voiceAttributeName(), AtomicString(m_token.annotation()));
+                child->setAttribute(VTTElement::voiceAttributeName(), m_token.annotation().toAtomicString());
             } else if (child->webVTTNodeType() == VTTNodeTypeLanguage) {
-                m_languageStack.append(AtomicString(m_token.annotation()));
+                m_languageStack.append(m_token.annotation().toAtomicString());
                 child->setAttribute(VTTElement::langAttributeName(), m_languageStack.last());
             }
             if (!m_languageStack.isEmpty())
                 child->setLanguage(m_languageStack.last());
             m_currentNode->parserAppendChild(child);
             m_currentNode = child;
         }
         break;
     }
     case VTTTokenTypes::EndTag: {
         VTTNodeType nodeType = tokenToNodeType(m_token);
         if (nodeType != VTTNodeTypeNone) {
             if (nodeType == VTTNodeTypeLanguage && m_currentNode->isVTTElement() && toVTTElement(m_currentNode.get())->webVTTNodeType() == VTTNodeTypeLanguage)
                 m_languageStack.removeLast();
             if (m_currentNode->parentNode())
                 m_currentNode = m_currentNode->parentNode();
         }
         break;
     }
     case VTTTokenTypes::TimestampTag: {
         unsigned position = 0;
-        String charactersString(StringImpl::create8BitIfPossible(m_token.characters()));
+        String charactersString = m_token.characters().toString();
         double time = VTTParser::collectTimeStamp(charactersString, &position);
         if (time != malformedTime)
             m_currentNode->parserAppendChild(ProcessingInstruction::create(document, "timestamp", charactersString));
         break;
     }
     default:
         break;
     }
     m_token.clear();
 }
 
 void VTTParser::skipWhiteSpace(const String& line, unsigned* position)
 {
     while (*position < line.length() && isASpace(line[*position]))
         (*position)++;
 }
 
 }