Changeset 65134 in webkit

Timestamp:

Aug 11, 2010 12:51:08 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-08-10 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Fix three ASSERTs hit with the HTML5 TreeBuilder in fragment mode
​https://bugs.webkit.org/show_bug.cgi?id=43762

In fixing the insertAdjacentHTML I had to make small changes to
the error logic, which ended up bringing us closer to HTML5.

Test: fast/dom/HTMLElement/insertAdjacentHTML-errors.html

• html/HTMLConstructionSite.cpp: (WebCore::HTMLConstructionSite::attach):
  • This ASSERT was just wrong, the child should not be attached in the case the parent is not attached.
• html/HTMLElement.cpp: (WebCore::contextElementForInsertion):
  • This is part of HTML5, needed to know what to call the HTML or XML parsers with. The previous code always passed "this" which is wrong in the case of beforeBegin or afterEnd insertion.

(WebCore::HTMLElement::insertAdjacentHTML):

• Use the right contextElement now that we know how to compute it.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processEndTagForInCell):
  • This ASSERT is direct from the spec, but it's wrong, so I've filed a spec bug.

2010-08-10 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Fix three ASSERTs hit with the HTML5 TreeBuilder in fragment mode
​https://bugs.webkit.org/show_bug.cgi?id=43762

In order to fix the insertAdjacentHTML I had to some behavior.
The behavior I changed brings us closer to the HTML5 spec,
but since it was not previously tested, I added tests.

• fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt: Added.
• fast/dom/HTMLElement/insertAdjacentHTML-errors.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (2 diffs)
• LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt (added)
• LayoutTests/fast/dom/HTMLElement/insertAdjacentHTML-errors.html (added)
• LayoutTests/fast/dom/HTMLElement/script-tests (added)
• LayoutTests/fast/dom/HTMLElement/script-tests/TEMPLATE.html (added)
• LayoutTests/fast/dom/HTMLElement/script-tests/insertAdjacentHTML-errors.js (added)
• LayoutTests/fast/dynamic/insertAdjacentHTML-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLConstructionSite.cpp (modified) (1 diff)
• WebCore/html/HTMLElement.cpp (modified) (1 diff)
• WebCore/html/HTMLTreeBuilder.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-10  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Fix three ASSERTs hit with the HTML5 TreeBuilder in fragment mode
+        https://bugs.webkit.org/show_bug.cgi?id=43762
+
+        In order to fix the insertAdjacentHTML I had to some behavior.
+        The behavior I changed brings us closer to the HTML5 spec,
+        but since it was not previously tested, I added tests.
+
+        * fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt: Added.
+        * fast/dom/HTMLElement/insertAdjacentHTML-errors.html: Added.
+
 2010-08-11  Yoshiki Hayashi  <yhayashi@google.com>
 
@@ -213 +227 @@
         * fast/dom/HTMLElement/insertAdjacentHTML-errors-expected.txt: Added.
         * fast/dom/HTMLElement/insertAdjacentHTML-errors.html: Added.
+        * fast/dom/HTMLElement/script-tests/TEMPLATE.html: Added.
+        * fast/dom/HTMLElement/script-tests/insertAdjacentHTML-errors.js: Added.
+        * fast/dynamic/insertAdjacentHTML-expected.txt:
+         - Updated to match HTML5's expected exception on error.
 
 2010-08-10  MORITA Hajime  <morrita@google.com>

trunk/LayoutTests/fast/dynamic/insertAdjacentHTML-expected.txt

@@ -1 @@
-Caught expected exception: Error: NOT_SUPPORTED_ERR: DOM Exception 9
+Caught expected exception: Error: SYNTAX_ERR: DOM Exception 12
 1 (black) 2 (green) 3 (green) 4 (black) 
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-10  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Fix three ASSERTs hit with the HTML5 TreeBuilder in fragment mode
+        https://bugs.webkit.org/show_bug.cgi?id=43762
+
+        In fixing the insertAdjacentHTML I had to make small changes to
+        the error logic, which ended up bringing us closer to HTML5.
+
+        Test: fast/dom/HTMLElement/insertAdjacentHTML-errors.html
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::attach):
+         - This ASSERT was just wrong, the child should not be attached
+           in the case the parent is not attached.
+        * html/HTMLElement.cpp:
+        (WebCore::contextElementForInsertion):
+         - This is part of HTML5, needed to know what to call the
+           HTML or XML parsers with.  The previous code always passed
+           "this" which is wrong in the case of beforeBegin or afterEnd insertion.
+        (WebCore::HTMLElement::insertAdjacentHTML):
+         - Use the right contextElement now that we know how to compute it.
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndTagForInCell):
+         - This ASSERT is direct from the spec, but it's wrong, so I've filed a spec bug.
+
 2010-08-11  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLConstructionSite.cpp

@@ -94 +94 @@
     if (shouldFosterParent()) {
         fosterParent(child.get());
-        ASSERT(child->attached());
+        ASSERT(child->attached() || !child->parent()->attached());
         return child.release();
     }

trunk/WebCore/html/HTMLElement.cpp

@@ -550 +550 @@
 }
 
+// Step 3 of http://www.whatwg.org/specs/web-apps/current-work/multipage/apis-in-html-documents.html#insertadjacenthtml()
+static Element* contextElementForInsertion(const String& where, Element* element, ExceptionCode& ec)
+{
+    if (equalIgnoringCase(where, "beforeBegin") || equalIgnoringCase(where, "afterEnd")) {
+        Node* parent = element->parentNode();
+        if (parent && parent->isDocumentNode()) {
+            ec = NO_MODIFICATION_ALLOWED_ERR;
+            return 0;
+        }
+        ASSERT(!parent || parent->isElementNode());
+        return static_cast<Element*>(parent);
+    }
+    if (equalIgnoringCase(where, "afterBegin") || equalIgnoringCase(where, "beforeEnd"))
+        return element;
+    ec =  SYNTAX_ERR;
+    return 0;
+}
+
 void HTMLElement::insertAdjacentHTML(const String& where, const String& markup, ExceptionCode& ec)
 {
     RefPtr<DocumentFragment> fragment = document()->createDocumentFragment();
+    Element* contextElement = contextElementForInsertion(where, this, ec);
+    if (!contextElement)
+        return;
+
     if (document()->isHTMLDocument())
-         fragment->parseHTML(markup, this);
+         fragment->parseHTML(markup, contextElement);
     else {
-        if (!fragment->parseXML(markup, this))
+        if (!fragment->parseXML(markup, contextElement))
             // FIXME: We should propagate a syntax error exception out here.
             return;

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -1998 +1998 @@
         m_tree.activeFormattingElements()->clearToLastMarker();
         setInsertionMode(InRowMode);
-        ASSERT(m_tree.currentElement()->hasTagName(trTag));
+        // FIXME: The fragment case of this ASSERT is a spec bug:
+        // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10338
+        ASSERT(m_tree.currentElement()->hasTagName(trTag) || (isParsingFragment() && m_fragmentContext.contextElement()->hasTagName(trTag)));
         return;
     }