Changeset 21720 in webkit

Timestamp:

May 24, 2007 11:26:21 AM (17 years ago)

Author:

hyatt

Message:

Fix for <rdar://problem/5208440> (13753)

REGRESSION: Raw text needs to be pulled outside of tables

Reviewed by aroben

• html/HTMLParser.cpp: (WebCore::HTMLParser::handleError):
• html/HTMLTableColElement.cpp: (WebCore::HTMLTableColElement::checkDTD):
• html/HTMLTableElement.cpp: (WebCore::HTMLTableElement::checkDTD):
• html/HTMLTableRowElement.cpp: (WebCore::HTMLTableRowElement::checkDTD):
• html/HTMLTableSectionElement.cpp: (WebCore::HTMLTableSectionElement::checkDTD):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLParser.cpp (modified) (2 diffs)
• html/HTMLTableColElement.cpp (modified) (2 diffs)
• html/HTMLTableElement.cpp (modified) (2 diffs)
• html/HTMLTableRowElement.cpp (modified) (2 diffs)
• html/HTMLTableSectionElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-24  David Hyatt  <hyatt@apple.com>
+
+        Fix for <rdar://problem/5208440> (13753)
+
+        REGRESSION: Raw text needs to be pulled outside of tables
+
+        Reviewed by aroben
+
+        * html/HTMLParser.cpp:
+        (WebCore::HTMLParser::handleError):
+        * html/HTMLTableColElement.cpp:
+        (WebCore::HTMLTableColElement::checkDTD):
+        * html/HTMLTableElement.cpp:
+        (WebCore::HTMLTableElement::checkDTD):
+        * html/HTMLTableRowElement.cpp:
+        (WebCore::HTMLTableRowElement::checkDTD):
+        * html/HTMLTableSectionElement.cpp:
+        (WebCore::HTMLTableSectionElement::checkDTD):
+
 2007-05-24  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/html/HTMLParser.cpp

@@ -493 +493 @@
                 handled = true;      // ...and start a new one
             } else {
-                bool possiblyMoveStrayContent = true;
                 ExceptionCode ec = 0;
-                if (n->isTextNode()) {
-                    Text* t = static_cast<Text*>(n);
-                    if (t->containsOnlyWhitespace())
-                        return false;
-                    StringImpl* i = t->string();
-                    unsigned int pos = 0;
-                    while (pos < i->length() && ((*i)[pos] == ' ' || (*i)[pos] == noBreakSpace))
-                        pos++;
-                    if (pos == i->length())
-                        possiblyMoveStrayContent = false;
-                }
-                if (possiblyMoveStrayContent) {
-                    Node* node = current;
+                Node* node = current;
+                Node* parent = node->parentNode();
+                // A script may have removed the current node's parent from the DOM
+                // http://bugs.webkit.org/show_bug.cgi?id=7137
+                // FIXME: we should do real recovery here and re-parent with the correct node.
+                if (!parent)
+                    return false;
+                Node* grandparent = parent->parentNode();
+
+                if (n->isTextNode() ||
+                    (h->hasLocalName(trTag) &&
+                     isTableSection(parent) && grandparent->hasTagName(tableTag)) ||
+                     ((!n->hasTagName(tdTag) && !n->hasTagName(thTag) &&
+                       !n->hasTagName(formTag) && !n->hasTagName(scriptTag)) && isTableSection(node) &&
+                     parent->hasTagName(tableTag))) {
+                    node = (node->hasTagName(tableTag)) ? node :
+                            ((node->hasTagName(trTag)) ? grandparent : parent);
                     Node* parent = node->parentNode();
-                    // A script may have removed the current node's parent from the DOM
-                    // http://bugs.webkit.org/show_bug.cgi?id=7137
-                    // FIXME: we should do real recovery here and re-parent with the correct node.
                     if (!parent)
                         return false;
-                    Node* grandparent = parent->parentNode();
-
-                    if (n->isTextNode() ||
-                        (h->hasLocalName(trTag) &&
-                         isTableSection(parent) && grandparent->hasTagName(tableTag)) ||
-                         ((!n->hasTagName(tdTag) && !n->hasTagName(thTag) &&
-                           !n->hasTagName(formTag) && !n->hasTagName(scriptTag)) && isTableSection(node) &&
-                         parent->hasTagName(tableTag))) {
-                        node = (node->hasTagName(tableTag)) ? node :
-                                ((node->hasTagName(trTag)) ? grandparent : parent);
-                        Node* parent = node->parentNode();
-                        if (!parent)
-                            return false;
-                        parent->insertBefore(n, node, ec);
-                        if (!ec) {
-                            reportError(StrayTableContentError, &localName, &currentTagName);
-                            if (n->isHTMLElement() && tagPriority > 0 && 
-                                !flat && static_cast<HTMLElement*>(n)->endTagRequirement() != TagStatusForbidden)
-                            {
-                                pushBlock(localName, tagPriority);
-                                setCurrent(n);
-                                inStrayTableContent++;
-                                blockStack->strayTableContent = true;
-                            }
-                            return true;
+                    parent->insertBefore(n, node, ec);
+                    if (!ec) {
+                        reportError(StrayTableContentError, &localName, &currentTagName);
+                        if (n->isHTMLElement() && tagPriority > 0 && 
+                            !flat && static_cast<HTMLElement*>(n)->endTagRequirement() != TagStatusForbidden)
+                        {
+                            pushBlock(localName, tagPriority);
+                            setCurrent(n);
+                            inStrayTableContent++;
+                            blockStack->strayTableContent = true;
                         }
+                        return true;
                     }
-
-                    if (!ec) {
-                        if (current->hasTagName(trTag)) {
-                            reportError(TablePartRequiredError, &localName, &tdTag.localName());
-                            e = new HTMLTableCellElement(tdTag, document);
-                        } else if (current->hasTagName(tableTag)) {
-                            // Don't report an error in this case, since making a <tbody> happens all the time when you have <table><tr>,
-                            // and it isn't really a parse error per se.
-                            e = new HTMLTableSectionElement(tbodyTag, document); 
-                        } else {
-                            reportError(TablePartRequiredError, &localName, &trTag.localName());
-                            e = new HTMLTableRowElement(document);
-                        }
-
-                        insertNode(e);
-                        handled = true;
+                }
+
+                if (!ec) {
+                    if (current->hasTagName(trTag)) {
+                        reportError(TablePartRequiredError, &localName, &tdTag.localName());
+                        e = new HTMLTableCellElement(tdTag, document);
+                    } else if (current->hasTagName(tableTag)) {
+                        // Don't report an error in this case, since making a <tbody> happens all the time when you have <table><tr>,
+                        // and it isn't really a parse error per se.
+                        e = new HTMLTableSectionElement(tbodyTag, document); 
+                    } else {
+                        reportError(TablePartRequiredError, &localName, &trTag.localName());
+                        e = new HTMLTableRowElement(document);
                     }
+
+                    insertNode(e);
+                    handled = true;
                 }
             }
@@ -578 +564 @@
             }
         } else if (h->hasLocalName(colgroupTag)) {
-            if (!n->isTextNode()) {
-                popBlock(currentTagName);
-                handled = true;
-            }
+            popBlock(currentTagName);
+            handled = true;
         } else if (!h->hasLocalName(bodyTag)) {
             if (isInline(current)) {

trunk/WebCore/html/HTMLTableColElement.cpp

@@ -31 +31 @@
 #include "RenderTableCol.h"
 #include "HTMLTableElement.h"
+#include "Text.h"
 
 namespace WebCore {
@@ -54 +55 @@
 bool HTMLTableColElement::checkDTD(const Node* newChild)
 {
-    return hasLocalName(colgroupTag) && newChild->hasTagName(colTag);
+    if (hasLocalName(colTag))
+        return false;
+    
+    if (newChild->isTextNode())
+        return static_cast<const Text*>(newChild)->containsOnlyWhitespace();
+    return newChild->hasTagName(colTag);
 }
 

trunk/WebCore/html/HTMLTableElement.cpp

@@ -38 +38 @@
 #include "HTMLTableSectionElement.h"
 #include "RenderTable.h"
+#include "Text.h"
 
 namespace WebCore {
@@ -65 +66 @@
 bool HTMLTableElement::checkDTD(const Node* newChild)
 {
-    return newChild->isTextNode() || newChild->hasTagName(captionTag) ||
+    if (newChild->isTextNode())
+        return static_cast<const Text*>(newChild)->containsOnlyWhitespace();
+    return newChild->hasTagName(captionTag) ||
            newChild->hasTagName(colTag) || newChild->hasTagName(colgroupTag) ||
            newChild->hasTagName(theadTag) || newChild->hasTagName(tfootTag) ||

trunk/WebCore/html/HTMLTableRowElement.cpp

@@ -34 +34 @@
 #include "HTMLTableSectionElement.h"
 #include "NodeList.h"
+#include "Text.h"
 
 namespace WebCore {
@@ -46 +47 @@
 bool HTMLTableRowElement::checkDTD(const Node* newChild)
 {
+    if (newChild->isTextNode())
+        return static_cast<const Text*>(newChild)->containsOnlyWhitespace();
     return newChild->hasTagName(tdTag) || newChild->hasTagName(thTag) ||
            newChild->hasTagName(formTag) || newChild->hasTagName(scriptTag);

trunk/WebCore/html/HTMLTableSectionElement.cpp

@@ -33 +33 @@
 #include "HTMLTableElement.h"
 #include "NodeList.h"
+#include "Text.h"
 
 namespace WebCore {
@@ -45 +46 @@
 bool HTMLTableSectionElement::checkDTD(const Node* newChild)
 {
+    if (newChild->isTextNode())
+        return static_cast<const Text*>(newChild)->containsOnlyWhitespace();
     return newChild->hasTagName(trTag) || newChild->hasTagName(formTag) ||
            newChild->hasTagName(scriptTag);