Changeset 61825 in webkit

Timestamp:

Jun 24, 2010 10:36:55 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

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

This mode is fairly similar to the others. I needed to change some of
the types around w.r.t. Nodes/Elements.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::HTMLTreeBuilder): (WebCore::HTMLTreeBuilder::processToken): (WebCore::HTMLTreeBuilder::insertElement):
• html/HTMLTreeBuilder.h: (WebCore::HTMLTreeBuilder::ElementStack::push): (WebCore::HTMLTreeBuilder::ElementStack::remove):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-24  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Sketch out AfterHeadMode for tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=41191
+
+        This mode is fairly similar to the others.  I needed to change some of
+        the types around w.r.t. Nodes/Elements.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::HTMLTreeBuilder):
+        (WebCore::HTMLTreeBuilder::processToken):
+        (WebCore::HTMLTreeBuilder::insertElement):
+        * html/HTMLTreeBuilder.h:
+        (WebCore::HTMLTreeBuilder::ElementStack::push):
+        (WebCore::HTMLTreeBuilder::ElementStack::remove):
+
 2010-06-24  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -56 +56 @@
 
 HTMLTreeBuilder::HTMLTreeBuilder(HTMLTokenizer* tokenizer, HTMLDocument* document, bool reportErrors)
-    : m_document(document)
+    : m_framesetOk(true)
+    , m_document(document)
     , m_reportErrors(reportErrors)
     , m_isPaused(false)
@@ -71 +72 @@
 // minimize code duplication between these constructors.
 HTMLTreeBuilder::HTMLTreeBuilder(HTMLTokenizer* tokenizer, DocumentFragment* fragment, FragmentScriptingPermission scriptingPermission)
-    : m_document(fragment->document())
+    : m_framesetOk(true)
+    , m_document(fragment->document())
     , m_reportErrors(false) // FIXME: Why not report errors in fragments?
     , m_isPaused(false)
@@ -440 +442 @@
             parseError(token);
             return 0;
-            break;
         case HTMLToken::Character:
             notImplemented();
@@ -454 +455 @@
         goto reprocessToken;
     }
-    case AfterHeadMode:
+    case AfterHeadMode: {
+        switch (token.type()) {
+        case HTMLToken::Uninitialized:
+            ASSERT_NOT_REACHED();
+            break;
+        case HTMLToken::Character:
+            if (isTreeBuilderWhiteSpace(cc)) {
+                insertCharacter(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() == bodyTag) {
+                m_framesetOk = false;
+                return insertElement(token);
+            }
+            if (token.name() == framesetTag) {
+                PassRefPtr<Node> node = insertElement(token);
+                setInsertionMode(InFramesetMode);
+                return node;
+            }
+            if (token.name() == baseTag || token.name() == linkTag || token.name() == metaTag || token.name() == noframesTag || token.name() == scriptTag || token.name() == styleTag || token.name() == titleTag) {
+                parseError(token);
+                ASSERT(m_headElement);
+                m_openElements.push(m_headElement.get());
+                notImplemented();
+                m_openElements.remove(m_headElement.get());
+            }
+            if (token.name() == headTag) {
+                parseError(token);
+                return 0;
+            }
+            break;
+        case HTMLToken::EndTag:
+            if (token.name() == bodyTag || token.name() == htmlTag || token.name() == brTag)    
+                break;
+            parseError(token);
+            return 0;
+        case HTMLToken::EndOfFile:
+            break;
+        }
+        AtomicHTMLToken fakeBody(HTMLToken::StartTag, bodyTag.localName());
+        processToken(fakeBody);
+        m_framesetOk = true;
+        goto reprocessToken;
+    }
     case InBodyMode:
     case TextMode:
@@ -491 +546 @@
 }
 
-PassRefPtr<Node> HTMLTreeBuilder::insertElement(AtomicHTMLToken& token)
+PassRefPtr<Element> HTMLTreeBuilder::insertElement(AtomicHTMLToken& token)
 {
     ASSERT_UNUSED(token, token.type() == HTMLToken::StartTag);

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -103 +103 @@
     public:
         void pop() { }
+        void push(Element*) { }
+        void remove(Element*) { }
         Element* top() const { return 0; }
     };
@@ -111 +113 @@
     PassRefPtr<Node> insertDoctype(AtomicHTMLToken&);
     PassRefPtr<Node> insertComment(AtomicHTMLToken&);
-    PassRefPtr<Node> insertElement(AtomicHTMLToken&);
+    PassRefPtr<Element> insertElement(AtomicHTMLToken&);
     void insertCharacter(UChar cc);
     PassRefPtr<Node> insertGenericRCDATAElement(AtomicHTMLToken&);
@@ -117 +119 @@
     PassRefPtr<Node> insertScriptElement(AtomicHTMLToken&);
 
-    RefPtr<Node> m_headElement;
+    RefPtr<Element> m_headElement;
     ElementStack m_openElements;
+    bool m_framesetOk;
 
     // FIXME: Implement error reporting.