- Revision
- 160182
- Author
- [email protected]
- Date
- 2013-12-05 11:45:29 -0800 (Thu, 05 Dec 2013)
Log 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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (160181 => 160182)
--- trunk/LayoutTests/ChangeLog 2013-12-05 19:23:03 UTC (rev 160181)
+++ trunk/LayoutTests/ChangeLog 2013-12-05 19:45:29 UTC (rev 160182)
@@ -1,3 +1,16 @@
+2013-12-04 Ryosuke Niwa <[email protected]>
+
+ 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 <[email protected]>
[MediaStream] Firing negotiationneeded event upon track add/remove on MediaStream
Added: trunk/LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2-expected.txt (0 => 160182)
--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2-expected.txt 2013-12-05 19:45:29 UTC (rev 160182)
@@ -0,0 +1,11 @@
+PASS templateWithIsindex.innerHTML is containerWithIsindex.innerHTML
+PASS templateWithFormInsideForm.innerHTML is '<form><input></form>'
+PASS formInsideTemplate = templateWithFormInsideForm.content.firstChild; formInsideTemplate.localName is 'form'
+PASS inputInsideTemplate = templateWithFormInsideForm.content.querySelector('input'); inputInsideTemplate.form is formInsideTemplate
+PASS formInsideTemplate.elements[0] is inputInsideTemplate
+PASS templateWithNestedForms.innerHTML is '<form><form></form></form>'
+PASS templateWithIsindexInsideForm.innerHTML is '<form>' + containerWithIsindex.innerHTML + '</form>'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2.html (0 => 160182)
--- trunk/LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLTemplateElement/no-form-association-2.html 2013-12-05 19:45:29 UTC (rev 160182)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<body>
+<div id="containerWithIsindex" style="display:none"><isindex></div>
+<form><template id="templateWithIsindex"><isindex></template></form>
+<form><template id="templateWithFormInsideForm"><form><input></form></template></form>
+<template id="templateWithNestedForms"><form><form></form></form></template>
+<template id="templateWithIsindexInsideForm"><form><isindex></form></template>
+<script src=""
+<script>
+
+shouldBe("templateWithIsindex.innerHTML", "containerWithIsindex.innerHTML");
+shouldBe("templateWithFormInsideForm.innerHTML", "'<form><input></form>'");
+shouldBe("formInsideTemplate = templateWithFormInsideForm.content.firstChild; formInsideTemplate.localName", "'form'");
+shouldBe("inputInsideTemplate = templateWithFormInsideForm.content.querySelector('input'); inputInsideTemplate.form", "formInsideTemplate");
+shouldBe("formInsideTemplate.elements[0]", "inputInsideTemplate");
+shouldBe("templateWithNestedForms.innerHTML", "'<form><form></form></form>'")
+shouldBe("templateWithIsindexInsideForm.innerHTML", "'<form>' + containerWithIsindex.innerHTML + '</form>'")
+
+</script>
+<script src=""
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (160181 => 160182)
--- trunk/Source/WebCore/ChangeLog 2013-12-05 19:23:03 UTC (rev 160181)
+++ trunk/Source/WebCore/ChangeLog 2013-12-05 19:45:29 UTC (rev 160182)
@@ -1,3 +1,38 @@
+2013-12-04 Ryosuke Niwa <[email protected]>
+
+ 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 <[email protected]>
[MediaStream] Firing negotiationneeded event upon track add/remove on MediaStream
Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (160181 => 160182)
--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2013-12-05 19:23:03 UTC (rev 160181)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2013-12-05 19:45:29 UTC (rev 160182)
@@ -411,10 +411,12 @@
{
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));
}
void HTMLConstructionSite::insertHTMLElement(AtomicHTMLToken* token)
@@ -537,6 +539,11 @@
return currentNode()->document();
}
+inline bool HTMLConstructionSite::insideTemplateElement()
+{
+ return !ownerDocumentForCurrentNode().frame();
+}
+
PassRefPtr<Element> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken* token)
{
QualifiedName tagName(nullAtom, token->name(), xhtmlNamespaceURI);
@@ -545,8 +552,8 @@
// to occur after construction to allow better code sharing here.
// 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());
return element.release();
Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.h (160181 => 160182)
--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.h 2013-12-05 19:23:03 UTC (rev 160181)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.h 2013-12-05 19:45:29 UTC (rev 160182)
@@ -119,6 +119,7 @@
HTMLStackItem* currentStackItem() const { return m_openElements.topStackItem(); }
HTMLStackItem* oneBelowTop() const { return m_openElements.oneBelowTop(); }
Document& ownerDocumentForCurrentNode();
+ bool insideTemplateElement();
HTMLElementStack* openElements() const { return &m_openElements; }
HTMLFormattingElementList* activeFormattingElements() const { return &m_activeFormattingElements; }
bool currentIsRootNode() { return m_openElements.topNode() == m_openElements.rootNode(); }
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (160181 => 160182)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2013-12-05 19:23:03 UTC (rev 160181)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2013-12-05 19:45:29 UTC (rev 160182)
@@ -462,7 +462,7 @@
ASSERT(token->type() == HTMLToken::StartTag);
ASSERT(token->name() == isindexTag);
parseError(token);
- if (m_tree.form())
+ if (m_tree.form() && !isParsingTemplateContents())
return;
notImplemented(); // Acknowledge self-closing flag
processFakeStartTag(formTag);
@@ -700,7 +700,7 @@
return;
}
if (token->name() == formTag) {
- if (m_tree.form()) {
+ if (m_tree.form() && !isParsingTemplateContents()) {
parseError(token);
return;
}
@@ -1051,7 +1051,7 @@
}
if (token->name() == formTag) {
parseError(token);
- if (m_tree.form())
+ if (m_tree.form() && !isParsingTemplateContents())
return;
m_tree.insertHTMLFormElement(token, true);
m_tree.openElements()->pop();
@@ -1864,15 +1864,26 @@
return;
}
if (token->name() == formTag) {
- RefPtr<Element> node = m_tree.takeForm();
- if (!node || !m_tree.openElements()->inScope(node.get())) {
- parseError(token);
- return;
+ 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());
}
- m_tree.generateImpliedEndTags();
- if (m_tree.currentElement() != node.get())
- parseError(token);
- m_tree.openElements()->remove(node.get());
}
if (token->name() == pTag) {
if (!m_tree.openElements()->inButtonScope(token->name())) {
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h (160181 => 160182)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h 2013-12-05 19:23:03 UTC (rev 160181)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.h 2013-12-05 19:45:29 UTC (rev 160182)
@@ -72,10 +72,10 @@
bool isParsingFragment() const { return !!m_fragmentContext.fragment(); }
#if ENABLE(TEMPLATE_ELEMENT)
bool isParsingTemplateContents() const { return m_tree.openElements()->hasTemplateInHTMLScope(); }
- bool isParsingFragmentOrTemplateContents() const { return isParsingFragment() || isParsingTemplateContents(); }
#else
- bool isParsingFragmentOrTemplateContents() const { return isParsingFragment(); }
+ bool isParsingTemplateContents() const { return false; }
#endif
+ bool isParsingFragmentOrTemplateContents() const { return isParsingFragment() || isParsingTemplateContents(); }
void detach();