Changeset 61822 in webkit

Timestamp:

Jun 24, 2010 10:31:48 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-24 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Sketch out BeforeHeadMode tree builder state
​https://bugs.webkit.org/show_bug.cgi?id=41183

This makes procesToken recursive, which might not be the best idea.
Also, we can now make fake AtomicHTMLTokens for use by the algorithm.

• html/HTMLToken.h: (WebCore::AtomicHTMLToken::AtomicHTMLToken):
• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processToken): (WebCore::HTMLTreeBuilder::insertElement):
• html/HTMLTreeBuilder.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLToken.h (modified) (1 diff)
• html/HTMLTreeBuilder.cpp (modified) (5 diffs)
• html/HTMLTreeBuilder.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-24  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Sketch out BeforeHeadMode tree builder state
+        https://bugs.webkit.org/show_bug.cgi?id=41183
+
+        This makes procesToken recursive, which might not be the best idea.
+        Also, we can now make fake AtomicHTMLTokens for use by the algorithm.
+
+        * html/HTMLToken.h:
+        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processToken):
+        (WebCore::HTMLTreeBuilder::insertElement):
+        * html/HTMLTreeBuilder.h:
+
 2010-06-22 Antonio Gomes <tonikitoo@webkit.org>
 

trunk/WebCore/html/HTMLToken.h

@@ -323 +323 @@
     }
 
+    AtomicHTMLToken(HTMLToken::Type type, AtomicString name)
+        : m_type(type)
+        , m_name(name)
+    {
+    }
+
     HTMLToken::Type type() const { return m_type; }
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -45 +45 @@
 
 static const int uninitializedLineNumberValue = -1;
+
+namespace {
+
+inline bool isTreeBuilderWhiteSpace(UChar cc)
+{
+    return cc == '\t' || cc == '\x0A' || cc == '\x0C' || cc == '\x0D' || cc == ' ';
+}
+
+} // namespace
 
 HTMLTreeBuilder::HTMLTreeBuilder(HTMLTokenizer* tokenizer, HTMLDocument* document, bool reportErrors)
@@ -243 +252 @@
             return insertComment(token);
         case HTMLToken::Character:
-            if (cc == '\t' || cc == '\x0A' || cc == '\x0C' || cc == '\x0D' || cc == ' ')
+            if (isTreeBuilderWhiteSpace(cc))
                 return 0;
             break;
@@ -267 +276 @@
             return insertComment(token);
         case HTMLToken::Character:
-            if (cc == '\t' || cc == '\x0A' || cc == '\x0C' || cc == '\x0D' || cc == ' ')
+            if (isTreeBuilderWhiteSpace(cc))
                 return 0;
             break;
@@ -289 +298 @@
         goto reprocessToken;
     }
-    case BeforeHeadMode:
+    case BeforeHeadMode: {
+        switch (token.type()) {
+        case HTMLToken::Uninitialized:
+            ASSERT_NOT_REACHED();
+            break;
+        case HTMLToken::Character:
+            if (isTreeBuilderWhiteSpace(cc))
+                return 0;
+            break;
+        case HTMLToken::Comment:
+            return insertComment(token);
+        case HTMLToken::DOCTYPE:
+            parseError(token);
+            return 0;
+        case HTMLToken::StartTag:
+            if (token.name() == htmlTag) {
+                notImplemented();
+                return 0;
+            }
+            if (token.name() == headTag) {
+                m_headElement = insertElement(token);
+                setInsertionMode(InHeadMode);
+                return m_headElement;
+            }
+            break;
+        case HTMLToken::EndTag:
+            if (token.name() == headTag || token.name() == bodyTag || token.name() == brTag) {
+                AtomicHTMLToken fakeHead(HTMLToken::StartTag, headTag.localName());
+                processToken(fakeHead);
+                goto reprocessToken;
+            }
+            parseError(token);
+            return 0;
+        case HTMLToken::EndOfFile:
+            break;
+        }
+        AtomicHTMLToken fakeHead(HTMLToken::StartTag, headTag.localName());
+        processToken(fakeHead);
+        goto reprocessToken;
+    }
     case InHeadMode:
     case InHeadNoscriptMode:
@@ -329 +377 @@
 }
 
+PassRefPtr<Node> HTMLTreeBuilder::insertElement(AtomicHTMLToken& token)
+{
+    ASSERT_UNUSED(token, token.type() == HTMLToken::StartTag);
+    return 0;
+}
+
 void HTMLTreeBuilder::finished()
 {

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -105 +105 @@
     PassRefPtr<Node> insertDoctype(AtomicHTMLToken&);
     PassRefPtr<Node> insertComment(AtomicHTMLToken&);
+    PassRefPtr<Node> insertElement(AtomicHTMLToken&);
+
+    RefPtr<Node> m_headElement;
 
     // FIXME: Implement error reporting.