Changeset 61823 in webkit

Timestamp:

Jun 24, 2010 10:33:35 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Sketch out InHeadMode for tree builder
​https://bugs.webkit.org/show_bug.cgi?id=41184

This state is relatively straightforward. We introduce the stack of
open elements to track that notion in the spec. The old tree builder
has a nice data structure for that, which we'll probably steal, but I'd
like to see what the full API is first.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processToken): (WebCore::HTMLTreeBuilder::insertCharacter): (WebCore::HTMLTreeBuilder::insertGenericRCDATAElement): (WebCore::HTMLTreeBuilder::insertGenericRawTextElement): (WebCore::HTMLTreeBuilder::insertScriptElement):
• html/HTMLTreeBuilder.h: (WebCore::HTMLTreeBuilder::ElementStack::pop): (WebCore::HTMLTreeBuilder::ElementStack::top):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-24  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Sketch out InHeadMode for tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=41184
+
+        This state is relatively straightforward.  We introduce the stack of
+        open elements to track that notion in the spec.  The old tree builder
+        has a nice data structure for that, which we'll probably steal, but I'd
+        like to see what the full API is first.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processToken):
+        (WebCore::HTMLTreeBuilder::insertCharacter):
+        (WebCore::HTMLTreeBuilder::insertGenericRCDATAElement):
+        (WebCore::HTMLTreeBuilder::insertGenericRawTextElement):
+        (WebCore::HTMLTreeBuilder::insertScriptElement):
+        * html/HTMLTreeBuilder.h:
+        (WebCore::HTMLTreeBuilder::ElementStack::pop):
+        (WebCore::HTMLTreeBuilder::ElementStack::top):
+
 2010-06-24  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -338 +338 @@
         goto reprocessToken;
     }
-    case InHeadMode:
+    case InHeadMode: {
+        switch (token.type()) {
+        case HTMLToken::Uninitialized:
+            ASSERT_NOT_REACHED();
+            break;
+        case HTMLToken::Character:
+            insertCharacter(cc);
+            break;
+        case HTMLToken::Comment:
+            return insertComment(token);
+        case HTMLToken::DOCTYPE:
+            parseError(token);
+            return 0;
+        case HTMLToken::StartTag:
+            if (token.name() == htmlTag) {
+                notImplemented();
+                return 0;
+            }
+            // FIXME: Atomize "command".
+            if (token.name() == baseTag || token.name() == "command" || token.name() == linkTag) {
+                PassRefPtr<Node> node = insertElement(token);
+                m_openElements.pop();
+                notImplemented();
+                return node;
+            }
+            if (token.name() == metaTag) {
+                PassRefPtr<Node> node = insertElement(token);
+                m_openElements.pop();
+                notImplemented();
+                return node;
+            }
+            if (token.name() == titleTag)
+                return insertGenericRCDATAElement(token);
+            if (token.name() == noscriptTag) {
+                if (isScriptingFlagEnabled(m_document->frame()))
+                    return insertGenericRawTextElement(token);
+                PassRefPtr<Node> node = insertElement(token);
+                setInsertionMode(InHeadNoscriptMode);
+                return node;
+            }
+            if (token.name() == noframesTag || token.name() == styleTag)
+                return insertGenericRawTextElement(token);
+            if (token.name() == scriptTag)
+                return insertScriptElement(token);
+            if (token.name() == headTag) {
+                notImplemented();
+                return 0;
+            }
+            break;
+        case HTMLToken::EndTag:
+            if (token.name() == headTag) {
+                ASSERT(m_openElements.top()->tagQName() == headTag);
+                m_openElements.pop();
+                setInsertionMode(AfterHeadMode);
+                return 0;
+            }
+            if (token.name() == bodyTag || token.name() == htmlTag || token.name() == brTag)
+                break;
+            parseError(token);
+            return 0;
+            break;
+        case HTMLToken::EndOfFile:
+            break;
+        }
+        AtomicHTMLToken fakeHead(HTMLToken::EndTag, headTag.localName());
+        processToken(fakeHead);
+        goto reprocessToken;
+    }
     case InHeadNoscriptMode:
     case AfterHeadMode:
@@ -383 +450 @@
 }
 
+void HTMLTreeBuilder::insertCharacter(UChar cc)
+{
+    ASSERT_UNUSED(cc, cc);
+}
+
+PassRefPtr<Node> HTMLTreeBuilder::insertGenericRCDATAElement(AtomicHTMLToken& token)
+{
+    ASSERT_UNUSED(token, token.type() == HTMLToken::StartTag);
+    return 0;
+}
+
+PassRefPtr<Node> HTMLTreeBuilder::insertGenericRawTextElement(AtomicHTMLToken& token)
+{
+    ASSERT_UNUSED(token, token.type() == HTMLToken::StartTag);
+    return 0;
+}
+
+PassRefPtr<Node> HTMLTreeBuilder::insertScriptElement(AtomicHTMLToken& token)
+{
+    ASSERT_UNUSED(token, token.type() == HTMLToken::StartTag);
+    return 0;
+}
+
 void HTMLTreeBuilder::finished()
 {

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -100 +100 @@
     };
 
+    class ElementStack : public Noncopyable {
+    public:
+        void pop() { }
+        Element* top() const { return 0; }
+    };
+
     PassRefPtr<Node> passTokenToLegacyParser(HTMLToken&);
     PassRefPtr<Node> processToken(AtomicHTMLToken&, UChar cc = 0);
@@ -106 +112 @@
     PassRefPtr<Node> insertComment(AtomicHTMLToken&);
     PassRefPtr<Node> insertElement(AtomicHTMLToken&);
+    void insertCharacter(UChar cc);
+    PassRefPtr<Node> insertGenericRCDATAElement(AtomicHTMLToken&);
+    PassRefPtr<Node> insertGenericRawTextElement(AtomicHTMLToken&);
+    PassRefPtr<Node> insertScriptElement(AtomicHTMLToken&);
 
     RefPtr<Node> m_headElement;
+    ElementStack m_openElements;
 
     // FIXME: Implement error reporting.