Defer setting type in the WebVTT tokenizer until emitting the token

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 38 matching lines @@
 class VTTToken {
     WTF_MAKE_NONCOPYABLE(VTTToken);
     WTF_MAKE_FAST_ALLOCATED;
 public:
     typedef VTTTokenTypes Type;
 
     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; }
+    void setType(Type::Type type) { m_type = type; }
 
     StringBuilder& name()
     {
         return m_data;
     }
 
     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 StringBuilder& characters)
     {
-        ASSERT(m_type == Type::Character);
         m_data.append(characters);
     }
 
     void beginEmptyStartTag()
     {
-        ASSERT(m_type == Type::Uninitialized);
-        m_type = Type::StartTag;
         m_data.clear();
     }
 
     void beginStartTag(UChar character)
     {
         ASSERT(character);
-        ASSERT(m_type == Type::Uninitialized);
-        m_type = Type::StartTag;
         m_data.append(character);
     }
 
     void beginEndTag(LChar character)
     {
-        ASSERT(m_type == Type::Uninitialized);
-        m_type = Type::EndTag;
         m_data.append(character);
     }
 
     void beginTimestampTag(UChar character)

[jochen (gone - plz use gerrit), 2013/11/20 14:09:37]

what's the point of having all this different methods that just
m_data.append(character) or appendToStartType(character) if you don't ASSERT()
the m_type anymore?

Would it make sense to clean that up?

     {
         ASSERT(character);
-        ASSERT(m_type == Type::Uninitialized);
-        m_type = Type::TimestampTag;
         m_data.append(character);
     }
 
     void appendToTimestamp(UChar character)
     {
         ASSERT(character);
-        ASSERT(m_type == Type::TimestampTag);
         m_data.append(character);
     }
 
     void appendToClass(UChar character)
     {
         appendToStartType(character);
     }
 
     void addNewClass()
     {
-        ASSERT(m_type == Type::StartTag);
         if (!m_classes.isEmpty())
             m_classes.append(' ');
         m_classes.append(m_currentBuffer);
         m_currentBuffer.clear();
     }
 
     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();
     }
 
     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;
     StringBuilder m_data;
     StringBuilder m_annotation;
     StringBuilder m_classes;
     StringBuilder m_currentBuffer;
 };
 
 }
 
 #endif