Replace character vectors with StringBuilders in the WebVTT tokenizer

Source/core/html/track/vtt/VTTToken.h

 /*
  * 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 13 matching lines @@
  * 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 VTTToken_h
 #define VTTToken_h
 
+#include "wtf/text/StringBuilder.h"
+
 namespace WebCore {
 
 class VTTTokenTypes {
 public:
     enum Type {
         Uninitialized,
         Character,
         StartTag,
         EndTag,
         TimestampTag,
     };
 };
 
 class VTTToken {
     WTF_MAKE_NONCOPYABLE(VTTToken);
     WTF_MAKE_FAST_ALLOCATED;
 public:
     typedef VTTTokenTypes Type;
-    typedef WTF::Vector<UChar, 1024> DataVector; // FIXME: Is this too large for WebVTT?
 
     VTTToken() { clear(); }
 
     void appendToName(UChar character)
     {
         ASSERT(m_type == VTTTokenTypes::StartTag || m_type == VTTTokenTypes::EndTag);
         ASSERT(character);
         m_data.append(character);
     }
 
     Type::Type type() const { return m_type; }
 
-    const DataVector& name() const
+    StringBuilder& name()
     {
         return m_data;
     }
 
-    const DataVector& characters() const
+    StringBuilder& characters()
     {
         ASSERT(m_type == Type::Character || m_type == Type::TimestampTag);
         return m_data;
     }
 
     // Starting a character token works slightly differently than starting
     // other types of tokens because we want to save a per-character branch.
     void ensureIsCharacterToken()
     {
         ASSERT(m_type == Type::Uninitialized || m_type == Type::Character);
         m_type = Type::Character;
     }
 
     void appendToCharacter(char character)
     {
         ASSERT(m_type == Type::Character);
         m_data.append(character);
     }
 
     void appendToCharacter(UChar character)
     {
         ASSERT(m_type == Type::Character);
         m_data.append(character);
     }
 
-    void appendToCharacter(const Vector<LChar, 32>& characters)
+    void appendToCharacter(const StringBuilder& characters)
     {
         ASSERT(m_type == Type::Character);
-        m_data.appendVector(characters);
+        m_data.append(characters);
     }
 
     void beginEmptyStartTag()
     {
         ASSERT(m_type == Type::Uninitialized);
         m_type = Type::StartTag;
         m_data.clear();
     }
 
     void beginStartTag(UChar character)
@@ skipping 33 matching lines @@
 
     void addNewClass()
     {
         ASSERT(m_type == Type::StartTag);
         if (!m_classes.isEmpty())
             m_classes.append(' ');
         m_classes.append(m_currentBuffer);
         m_currentBuffer.clear();
     }
 
-    const DataVector& classes() const
+    StringBuilder& classes()
     {
         return m_classes;
     }
 
     void appendToAnnotation(UChar character)
     {
         appendToStartType(character);
     }
 
     void addNewAnnotation()
     {
         ASSERT(m_type == Type::StartTag);
         m_annotation.clear();
         m_annotation.append(m_currentBuffer);
         m_currentBuffer.clear();
     }
 
-    const DataVector& annotation() const
+    StringBuilder& annotation()
     {
         return m_annotation;
     }
 
     void clear()
     {
         m_type = Type::Uninitialized;
         m_data.clear();
         m_annotation.clear();
         m_classes.clear();
         m_currentBuffer.clear();
     }
 
 private:
     void appendToStartType(UChar character)
     {
         ASSERT(character);
         ASSERT(m_type == Type::StartTag);
         m_currentBuffer.append(character);
     }
 
     Type::Type m_type;
-    DataVector m_data;
-    DataVector m_annotation;
-    DataVector m_classes;
-    DataVector m_currentBuffer;
+    StringBuilder m_data;
+    StringBuilder m_annotation;
+    StringBuilder m_classes;
+    StringBuilder m_currentBuffer;
 };
 
 }
 
 #endif