Changeset 62042 in webkit

Timestamp:

Jun 28, 2010 3:24:37 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Add text nodes to the DOM
​https://bugs.webkit.org/show_bug.cgi?id=41306

Actually add some text nodes to the DOM when parsing a document. We're
going to need to do something fancier here eventually, but this gets us
past the error we're seeing currently in runner.html.

Unfortunately, this patch "regresses" runner.html in the sense that we
now hit an assert, but it's still an improvement... I'll update the
HTML5 expectations once we get past the assert.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processCharacter): (WebCore::HTMLTreeBuilder::insertTextNode):
• html/HTMLTreeBuilder.h:

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-28  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add text nodes to the DOM
+        https://bugs.webkit.org/show_bug.cgi?id=41306
+
+        Actually add some text nodes to the DOM when parsing a document.  We're
+        going to need to do something fancier here eventually, but this gets us
+        past the error we're seeing currently in runner.html.
+
+        Unfortunately, this patch "regresses" runner.html in the sense that we
+        now hit an assert, but it's still an improvement...  I'll update the
+        HTML5 expectations once we get past the assert.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processCharacter):
+        (WebCore::HTMLTreeBuilder::insertTextNode):
+        * html/HTMLTreeBuilder.h:
+
 2010-06-28  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -665 +665 @@
 void HTMLTreeBuilder::processCharacter(AtomicHTMLToken& token)
 {
-    if (insertionMode() == TextMode) {
-        attach(currentElement(), Text::create(m_document, token.characters()));
-        return;
-    }
     // FIXME: We need to figure out how to handle each character individually.
-    notImplemented();
+    switch (insertionMode()) {
+    case InitialMode:
+        ASSERT(insertionMode() == InitialMode);
+        notImplemented();
+        processDefaultForInitialMode(token);
+        // Fall through.
+    case BeforeHTMLMode:
+        ASSERT(insertionMode() == BeforeHTMLMode);
+        notImplemented();
+        processDefaultForBeforeHTMLMode(token);
+        // Fall through.
+    case BeforeHeadMode:
+        ASSERT(insertionMode() == BeforeHeadMode);
+        notImplemented();
+        processDefaultForBeforeHeadMode(token);
+        // Fall through.
+    case InHeadMode:
+        ASSERT(insertionMode() == InHeadMode);
+        notImplemented();
+        processDefaultForInHeadMode(token);
+        // Fall through.
+    case AfterHeadMode:
+        ASSERT(insertionMode() == AfterHeadMode);
+        notImplemented();
+        processDefaultForAfterHeadMode(token);
+        // Fall through
+    case InBodyMode:
+        ASSERT(insertionMode() == InBodyMode);
+        notImplemented();
+        insertTextNode(token);
+        break;
+    case TextMode:
+        notImplemented();
+        insertTextNode(token);
+        break;
+    case InHeadNoscriptMode:
+        ASSERT(insertionMode() == InHeadNoscriptMode);
+        processDefaultForInHeadNoscriptMode(token);
+        processToken(token);
+        break;
+    default:
+        notImplemented();
+    }
 }
 
@@ -860 +898 @@
 }
 
+void HTMLTreeBuilder::insertTextNode(AtomicHTMLToken& token)
+{
+    attach(currentElement(), Text::create(m_document, token.characters()));
+}
+    
 PassRefPtr<Element> HTMLTreeBuilder::createElement(AtomicHTMLToken& token)
 {

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -201 +201 @@
     void insertGenericRawTextElement(AtomicHTMLToken&);
     void insertScriptElement(AtomicHTMLToken&);
+    void insertTextNode(AtomicHTMLToken&);
 
     void insertHTMLStartTagBeforeHTML(AtomicHTMLToken&);