Changeset 160182 in webkit

Timestamp:

Dec 5, 2013 11:45:29 AM (10 years ago)

Author:

rniwa@webkit.org

Message:

Change how the form element pointer affects parsing template elements, to reduce weirdness in templates
​https://bugs.webkit.org/show_bug.cgi?id=125279

Reviewed by Antti Koivisto.

Source/WebCore:

Faithfully update the HTML5 parser after ​http://html5.org/tools/web-apps-tracker?from=8330&to=8331.

Test: fast/dom/HTMLTemplateElement/no-form-association-2.html

• html/parser/HTMLConstructionSite.cpp:

(WebCore::HTMLConstructionSite::insertHTMLFormElement): Don't the form element pointer if the context
element or its ancestor is a template element.
(WebCore::HTMLConstructionSite::insideTemplateElement): Added.
(WebCore::HTMLConstructionSite::createHTMLElement): Renamed openElementsContainTemplateElement to
insideTemplateElement to reflect the true semantics of the boolean.

• html/parser/HTMLConstructionSite.h:

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::processIsindexStartTagForInBody): Ignore the form element pointer if there
is a template element on the stack of open elements. This faithfully reflects what's being said in the
specification. We should probably make isParsingTemplateContents more efficient by storing a boolean
and then wrap from() in some helper function but that should probbaly happen in a separate patch.
(WebCore::HTMLTreeBuilder::processStartTagForInBody): Ditto.
(WebCore::HTMLTreeBuilder::processStartTagForInTable): Ditto.
(WebCore::HTMLTreeBuilder::processEndTagForInBody): Don't unset or rely on the form element pointer
when there is a template element on the stack of open elements.

• html/parser/HTMLTreeBuilder.h:

(WebCore::HTMLTreeBuilder::isParsingTemplateContents): Added a trivial implementation for when
TEMPLATE_ELEMENT is disabled.
(WebCore::HTMLTreeBuilder::isParsingFragmentOrTemplateContents): Merged two implementations.

LayoutTests:

Added a regression test. Someone should port this test into web-platform-tests once the latest spec.
change has been refelcted to a working draft version of the HTML5 specification.

• fast/dom/HTMLTemplateElement/no-form-association-2-expected.txt: Added.
• fast/dom/HTMLTemplateElement/no-form-association-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2-expected.txt (added)
• LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLConstructionSite.cpp (modified) (3 diffs)
• Source/WebCore/html/parser/HTMLConstructionSite.h (modified) (1 diff)
• Source/WebCore/html/parser/HTMLTreeBuilder.cpp (modified) (4 diffs)
• Source/WebCore/html/parser/HTMLTreeBuilder.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-12-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Change how the form element pointer affects parsing template elements, to reduce weirdness in templates
+        https://bugs.webkit.org/show_bug.cgi?id=125279
+
+        Reviewed by Antti Koivisto.
+
+        Added a regression test. Someone should port this test into web-platform-tests once the latest spec.
+        change has been refelcted to a working draft version of the HTML5 specification.
+
+        * fast/dom/HTMLTemplateElement/no-form-association-2-expected.txt: Added.
+        * fast/dom/HTMLTemplateElement/no-form-association-2.html: Added.
+
 2013-12-05  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Change how the form element pointer affects parsing template elements, to reduce weirdness in templates
+        https://bugs.webkit.org/show_bug.cgi?id=125279
+
+        Reviewed by Antti Koivisto.
+
+        Faithfully update the HTML5 parser after http://html5.org/tools/web-apps-tracker?from=8330&to=8331.
+
+        Test: fast/dom/HTMLTemplateElement/no-form-association-2.html
+
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertHTMLFormElement): Don't the form element pointer if the context
+        element or its ancestor is a template element.
+        (WebCore::HTMLConstructionSite::insideTemplateElement): Added.
+        (WebCore::HTMLConstructionSite::createHTMLElement): Renamed openElementsContainTemplateElement to
+        insideTemplateElement to reflect the true semantics of the boolean.
+
+        * html/parser/HTMLConstructionSite.h:
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processIsindexStartTagForInBody): Ignore the form element pointer if there
+        is a template element on the stack of open elements. This faithfully reflects what's being said in the
+        specification. We should probably make isParsingTemplateContents more efficient by storing a boolean
+        and then wrap from() in some helper function but that should probbaly happen in a separate patch.
+        (WebCore::HTMLTreeBuilder::processStartTagForInBody): Ditto.
+        (WebCore::HTMLTreeBuilder::processStartTagForInTable): Ditto.
+        (WebCore::HTMLTreeBuilder::processEndTagForInBody): Don't unset or rely on the form element pointer
+        when there is a template element on the stack of open elements.
+
+        * html/parser/HTMLTreeBuilder.h:
+        (WebCore::HTMLTreeBuilder::isParsingTemplateContents): Added a trivial implementation for when
+        TEMPLATE_ELEMENT is disabled.
+        (WebCore::HTMLTreeBuilder::isParsingFragmentOrTemplateContents): Merged two implementations.
+
 2013-12-05  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -412 +412 @@
     RefPtr<Element> element = createHTMLElement(token);
     ASSERT(isHTMLFormElement(element.get()));
-    m_form = static_pointer_cast<HTMLFormElement>(element.release());
-    m_form->setDemoted(isDemoted);
-    attachLater(currentNode(), m_form);
-    m_openElements.push(HTMLStackItem::create(m_form, token));
+    RefPtr<HTMLFormElement> form = static_pointer_cast<HTMLFormElement>(element.release());
+    if (!insideTemplateElement())
+        m_form = form;
+    form->setDemoted(isDemoted);
+    attachLater(currentNode(), form);
+    m_openElements.push(HTMLStackItem::create(form.release(), token));
 }
 
@@ -538 +540 @@
 }
 
+inline bool HTMLConstructionSite::insideTemplateElement()
+{
+    return !ownerDocumentForCurrentNode().frame();
+}
+
 PassRefPtr<Element> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken* token)
 {
@@ -546 +553 @@
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/tree-construction.html#create-an-element-for-the-token
     Document& ownerDocument = ownerDocumentForCurrentNode();
-    bool openElementsContainTemplateElement = !ownerDocument.frame();
-    RefPtr<Element> element = HTMLElementFactory::createElement(tagName, ownerDocument, openElementsContainTemplateElement ? nullptr : form(), true);
+    bool insideTemplateElement = !ownerDocument.frame();
+    RefPtr<Element> element = HTMLElementFactory::createElement(tagName, ownerDocument, insideTemplateElement ? nullptr : form(), true);
     setAttributes(element.get(), token, m_parserContentPolicy);
     ASSERT(element->isHTMLElement());

trunk/Source/WebCore/html/parser/HTMLConstructionSite.h

@@ -120 +120 @@
     HTMLStackItem* oneBelowTop() const { return m_openElements.oneBelowTop(); }
     Document& ownerDocumentForCurrentNode();
+    bool insideTemplateElement();
     HTMLElementStack* openElements() const { return &m_openElements; }
     HTMLFormattingElementList* activeFormattingElements() const { return &m_activeFormattingElements; }

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

@@ -463 +463 @@
     ASSERT(token->name() == isindexTag);
     parseError(token);
-    if (m_tree.form())
+    if (m_tree.form() && !isParsingTemplateContents())
         return;
     notImplemented(); // Acknowledge self-closing flag
@@ -701 +701 @@
     }
     if (token->name() == formTag) {
-        if (m_tree.form()) {
+        if (m_tree.form() && !isParsingTemplateContents()) {
             parseError(token);
             return;
@@ -1052 +1052 @@
     if (token->name() == formTag) {
         parseError(token);
-        if (m_tree.form())
+        if (m_tree.form() && !isParsingTemplateContents())
             return;
         m_tree.insertHTMLFormElement(token, true);
@@ -1865 +1865 @@
     }
     if (token->name() == formTag) {
-        RefPtr<Element> node = m_tree.takeForm();
-        if (!node || !m_tree.openElements()->inScope(node.get())) {
-            parseError(token);
-            return;
-        }
-        m_tree.generateImpliedEndTags();
-        if (m_tree.currentElement() != node.get())
-            parseError(token);
-        m_tree.openElements()->remove(node.get());
+        if (!isParsingTemplateContents()) {
+            RefPtr<Element> node = m_tree.takeForm();
+            if (!node || !m_tree.openElements()->inScope(node.get())) {
+                parseError(token);
+                return;
+            }
+            m_tree.generateImpliedEndTags();
+            if (m_tree.currentNode() != node.get())
+                parseError(token);
+            m_tree.openElements()->remove(node.get());
+        } else {
+            if (!m_tree.openElements()->inScope(token->name())) {
+                parseError(token);
+                return;
+            }
+            m_tree.generateImpliedEndTags();
+            if (!m_tree.currentNode()->hasTagName(formTag))
+                parseError(token);
+            m_tree.openElements()->popUntilPopped(token->name());
+        }
     }
     if (token->name() == pTag) {

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h

@@ -73 +73 @@
 #if ENABLE(TEMPLATE_ELEMENT)
     bool isParsingTemplateContents() const { return m_tree.openElements()->hasTemplateInHTMLScope(); }
+#else
+    bool isParsingTemplateContents() const { return false; }
+#endif
     bool isParsingFragmentOrTemplateContents() const { return isParsingFragment() || isParsingTemplateContents(); }
-#else
-    bool isParsingFragmentOrTemplateContents() const { return isParsingFragment(); }
-#endif
 
     void detach();