Changeset 142484 in webkit

Timestamp:

Feb 11, 2013 9:54:50 AM (11 years ago)

Author:

eric@webkit.org

Message:

Move WebVTTToken off of MarkupTokenBase
​https://bugs.webkit.org/show_bug.cgi?id=109410

Reviewed by Tony Gentilcore.

This introduces a small amount of "copy/paste" code
but actually makes WebVTTToken much smaller and simpler!
This also frees the HTMLParser to have its Token class
back to itself so we can tune it to make HTML faster.

• html/track/WebVTTToken.h:

(WebVTTToken):
(WebCore::WebVTTToken::WebVTTToken):
(WebCore::WebVTTToken::appendToName):
(WebCore::WebVTTToken::type):
(WebCore::WebVTTToken::name):
(WebCore::WebVTTToken::ensureIsCharacterToken):
(WebCore::WebVTTToken::appendToCharacter):
(WebCore::WebVTTToken::beginEmptyStartTag):
(WebCore::WebVTTToken::beginStartTag):
(WebCore::WebVTTToken::beginEndTag):
(WebCore::WebVTTToken::beginTimestampTag):
(WebCore::WebVTTToken::makeEndOfFile):
(WebCore::WebVTTToken::clear):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/track/WebVTTToken.h (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-11  Eric Seidel  <eric@webkit.org>
+
+        Move WebVTTToken off of MarkupTokenBase
+        https://bugs.webkit.org/show_bug.cgi?id=109410
+
+        Reviewed by Tony Gentilcore.
+
+        This introduces a small amount of "copy/paste" code
+        but actually makes WebVTTToken much smaller and simpler!
+        This also frees the HTMLParser to have its Token class
+        back to itself so we can tune it to make HTML faster.
+
+        * html/track/WebVTTToken.h:
+        (WebVTTToken):
+        (WebCore::WebVTTToken::WebVTTToken):
+        (WebCore::WebVTTToken::appendToName):
+        (WebCore::WebVTTToken::type):
+        (WebCore::WebVTTToken::name):
+        (WebCore::WebVTTToken::ensureIsCharacterToken):
+        (WebCore::WebVTTToken::appendToCharacter):
+        (WebCore::WebVTTToken::beginEmptyStartTag):
+        (WebCore::WebVTTToken::beginStartTag):
+        (WebCore::WebVTTToken::beginEndTag):
+        (WebCore::WebVTTToken::beginTimestampTag):
+        (WebCore::WebVTTToken::makeEndOfFile):
+        (WebCore::WebVTTToken::clear):
+
 2013-02-11  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/html/track/WebVTTToken.h

@@ -34 +34 @@
 #if ENABLE(VIDEO_TRACK)
 
-#include "MarkupTokenBase.h"
-
 namespace WebCore {
 
@@ -50 +48 @@
 };
 
-class WebVTTToken : public MarkupTokenBase<WebVTTTokenTypes> {
+class WebVTTToken {
+    WTF_MAKE_NONCOPYABLE(WebVTTToken);
+    WTF_MAKE_FAST_ALLOCATED;
 public:
+    typedef WebVTTTokenTypes Type;
+    typedef WTF::Vector<UChar, 1024> DataVector; // FIXME: Is this too large for WebVTT?
+
+    WebVTTToken() { clear(); }
+
     void appendToName(UChar character)
     {
         ASSERT(m_type == WebVTTTokenTypes::StartTag || m_type == WebVTTTokenTypes::EndTag);
-        MarkupTokenBase<WebVTTTokenTypes>::appendToName(character);
-    }
-    
+        ASSERT(character);
+        m_data.append(character);
+    }
+
+    Type::Type type() const { return m_type; }
+
     const DataVector& name() const
     {
-        return MarkupTokenBase<WebVTTTokenTypes>::name();
-    }
-    
+        return m_data;
+    }
+
     const DataVector& characters() const
     {
@@ -68 +76 @@
         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)
+    {
+        ASSERT(m_type == Type::Character);
+        m_data.appendVector(characters);
+    }
+
     void beginEmptyStartTag()
     {
         ASSERT(m_type == Type::Uninitialized);
         m_type = Type::StartTag;
-        m_currentAttribute = 0;
-        m_attributes.clear();
         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)
     {
@@ -83 +130 @@
         ASSERT(m_type == Type::Uninitialized);
         m_type = Type::TimestampTag;
-        m_selfClosing = true;
         m_data.append(character);
     }
@@ -130 +176 @@
         return m_annotation;
     }
+
+    void makeEndOfFile()
+    {
+        ASSERT(m_type == Type::Uninitialized);
+        m_type = Type::EndOfFile;
+    }
     
     void clear()
     {
+        m_type = Type::Uninitialized;
+        m_data.clear();
         m_annotation.clear();
         m_classes.clear();
         m_currentBuffer.clear();
-        MarkupTokenBase<WebVTTTokenTypes>::clear();
     }
 
@@ -147 +200 @@
     }
 
+    Type::Type m_type;
+    DataVector m_data;
     DataVector m_annotation;
     DataVector m_classes;