Changeset 139953 in webkit

Timestamp:

Jan 16, 2013 7:36:48 PM (11 years ago)

Author:

tonyg@chromium.org

Message:

Introduce a method to build the tree from a CompactHTMLToken
​https://bugs.webkit.org/show_bug.cgi?id=107082

Reviewed by Adam Barth.

No new tests because covered by existing fast/parser tests.

• html/parser/HTMLDocumentParser.cpp:

(WebCore):
(WebCore::HTMLDocumentParser::constructTreeFromCompactHTMLToken):

• html/parser/HTMLDocumentParser.h:
• html/parser/HTMLToken.h:

(AtomicHTMLToken):
(WebCore::AtomicHTMLToken::create):
(WebCore::AtomicHTMLToken::AtomicHTMLToken):

• xml/parser/MarkupTokenBase.h:

(WebCore::AtomicMarkupTokenBase::AtomicMarkupTokenBase):
(AtomicMarkupTokenBase):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLDocumentParser.cpp (modified) (1 diff)
• html/parser/HTMLDocumentParser.h (modified) (1 diff)
• html/parser/HTMLToken.h (modified) (3 diffs)
• xml/parser/MarkupTokenBase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Tony Gentilcore  <tonyg@chromium.org>
+
+        Introduce a method to build the tree from a CompactHTMLToken
+        https://bugs.webkit.org/show_bug.cgi?id=107082
+
+        Reviewed by Adam Barth.
+
+        No new tests because covered by existing fast/parser tests.
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore):
+        (WebCore::HTMLDocumentParser::constructTreeFromCompactHTMLToken):
+        * html/parser/HTMLDocumentParser.h:
+        * html/parser/HTMLToken.h:
+        (AtomicHTMLToken):
+        (WebCore::AtomicHTMLToken::create):
+        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
+        * xml/parser/MarkupTokenBase.h:
+        (WebCore::AtomicMarkupTokenBase::AtomicMarkupTokenBase):
+        (AtomicMarkupTokenBase):
+
 2013-01-16  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -341 +341 @@
 }
 
+#if ENABLE(THREADED_HTML_PARSER)
+
+void HTMLDocumentParser::constructTreeFromCompactHTMLToken(const CompactHTMLToken& compactToken)
+{
+    RefPtr<AtomicHTMLToken> token = AtomicHTMLToken::create(compactToken);
+    m_treeBuilder->constructTree(token.get());
+}
+
+#endif
+
 bool HTMLDocumentParser::hasInsertionPoint()
 {

trunk/Source/WebCore/html/parser/HTMLDocumentParser.h

@@ -128 +128 @@
     void pumpTokenizerIfPossible(SynchronousMode);
     void constructTreeFromHTMLToken(HTMLToken&);
+#if ENABLE(THREADED_HTML_PARSER)
+    void constructTreeFromCompactHTMLToken(const CompactHTMLToken&);
+#endif
 
     void runScriptsForPausedTreeBuilder();

trunk/Source/WebCore/html/parser/HTMLToken.h

@@ -27 +27 @@
 #define HTMLToken_h
 
+#include "CompactHTMLToken.h"
 #include "HTMLTokenTypes.h"
 #include "MarkupTokenBase.h"
@@ -69 +70 @@
     }
 
+#if ENABLE(THREADED_HTML_PARSER)
+
+    static PassRefPtr<AtomicHTMLToken> create(const CompactHTMLToken& token)
+    {
+        return adoptRef(new AtomicHTMLToken(token));
+    }
+
+#endif
+
     static PassRefPtr<AtomicHTMLToken> create(HTMLTokenTypes::Type type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())
     {
@@ -85 +95 @@
     }
 
+#if ENABLE(THREADED_HTML_PARSER)
+
+    explicit AtomicHTMLToken(const CompactHTMLToken& token)
+        : AtomicMarkupTokenBase<HTMLToken>(token.type())
+    {
+        switch (m_type) {
+        case HTMLTokenTypes::Uninitialized:
+            ASSERT_NOT_REACHED();
+            break;
+        case HTMLTokenTypes::DOCTYPE:
+            m_name = token.data();
+            m_doctypeData = adoptPtr(new HTMLToken::DoctypeData());
+            m_doctypeData->m_hasPublicIdentifier = true;
+            m_doctypeData->m_publicIdentifier.append(token.publicIdentifier().characters(), token.publicIdentifier().length());
+            m_doctypeData->m_hasSystemIdentifier = true;
+            m_doctypeData->m_systemIdentifier.append(token.systemIdentifier().characters(), token.systemIdentifier().length());
+            break;
+        case HTMLTokenTypes::EndOfFile:
+            break;
+        case HTMLTokenTypes::StartTag:
+            m_attributes.reserveInitialCapacity(token.attributes().size());
+            for (Vector<CompactAttribute>::const_iterator it = token.attributes().begin(); it != token.attributes().end(); ++it)
+                m_attributes.append(Attribute(QualifiedName(nullAtom, it->name(), nullAtom), it->value()));
+            // Fall through!
+        case HTMLTokenTypes::EndTag:
+            m_selfClosing = token.selfClosing();
+            m_name = AtomicString(token.data());
+            break;
+        case HTMLTokenTypes::Comment:
+            m_data = token.data();
+            break;
+        case HTMLTokenTypes::Character:
+            m_externalCharacters = token.data().characters();
+            m_externalCharactersLength = token.data().length();
+            break;
+        default:
+            break;
+        }
+    }
+
+#endif
+
     AtomicHTMLToken(HTMLTokenTypes::Type type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())
         : AtomicMarkupTokenBase<HTMLToken>(type, name, attributes)

trunk/Source/WebCore/xml/parser/MarkupTokenBase.h

@@ -474 +474 @@
     }
 
+    explicit AtomicMarkupTokenBase(typename Token::Type::Type type)
+        : m_type(type)
+        , m_externalCharacters(0)
+        , m_externalCharactersLength(0)
+        , m_isAll8BitData(false)
+        , m_selfClosing(false)
+    {
+    }
+
     AtomicMarkupTokenBase(typename Token::Type::Type type, const AtomicString& name, const Vector<Attribute>& attributes = Vector<Attribute>())
         : m_type(type)