<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178354] releases/WebKitGTK/webkit-2.6</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178354">178354</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 03:35:09 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/177263">r177263</a> - REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/160182">r160182</a>): Fragment parser doesn't close a form element with a close tag
https://bugs.webkit.org/show_bug.cgi?id=139561
Reviewed by Darin Adler.
Source/WebCore:
The bug was caused by us not setting the form pointer in insertHTMLFormElement.
Since we already avoid associating a form inside HTMLConstructionSite::createHTMLElement,
we didn't need this code at all.
Fixed the bug by partially reverting <a href="http://trac.webkit.org/projects/webkit/changeset/160182">r160182</a>.
Test: fast/dom/dom-parse-close-form.html
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::insertHTMLFormElement):
(WebCore::HTMLConstructionSite::insideTemplateElement): Deleted.
* html/parser/HTMLConstructionSite.h:
LayoutTests:
Added a regression test.
* fast/dom/dom-parse-close-form-expected.txt: Added.
* fast/dom/dom-parse-close-form.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorehtmlparserHTMLConstructionSitecpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorehtmlparserHTMLConstructionSiteh">releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastdomdomparsecloseformexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastdomdomparsecloseformhtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (178353 => 178354)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 11:28:39 UTC (rev 178353)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 11:35:09 UTC (rev 178354)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r160182): Fragment parser doesn't close a form element with a close tag
+ https://bugs.webkit.org/show_bug.cgi?id=139561
+
+ Reviewed by Darin Adler.
+
+ Added a regression test.
+
+ * fast/dom/dom-parse-close-form-expected.txt: Added.
+ * fast/dom/dom-parse-close-form.html: Added.
+
</ins><span class="cx"> 2014-12-10 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> InstancedArray crashes attempting to draw out of bounds
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastdomdomparsecloseformexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form-expected.txt (0 => 178354)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form-expected.txt 2015-01-13 11:35:09 UTC (rev 178354)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This tests that DOMParser closes a form element when it sees its close tag.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS (new DOMParser()).parseFromString("<form></form>text", "text/html").body.innerHTML is "<form></form>text"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastdomdomparsecloseformhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form.html (0 => 178354)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/dom/dom-parse-close-form.html 2015-01-13 11:35:09 UTC (rev 178354)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+
+description('This tests that DOMParser closes a form element when it sees its close tag.');
+
+shouldBeEqualToString('(new DOMParser()).parseFromString("<form></form>text", "text/html").body.innerHTML', '<form></form>text');
+
+var successfullyParsed = true;
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178353 => 178354)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 11:28:39 UTC (rev 178353)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 11:35:09 UTC (rev 178354)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r160182): Fragment parser doesn't close a form element with a close tag
+ https://bugs.webkit.org/show_bug.cgi?id=139561
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by us not setting the form pointer in insertHTMLFormElement.
+ Since we already avoid associating a form inside HTMLConstructionSite::createHTMLElement,
+ we didn't need this code at all.
+
+ Fixed the bug by partially reverting r160182.
+
+ Test: fast/dom/dom-parse-close-form.html
+
+ * html/parser/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::insertHTMLFormElement):
+ (WebCore::HTMLConstructionSite::insideTemplateElement): Deleted.
+ * html/parser/HTMLConstructionSite.h:
+
</ins><span class="cx"> 2014-12-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Initialize m_ownsGeneratedFile when decoding a FormDataElement
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorehtmlparserHTMLConstructionSitecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.cpp (178353 => 178354)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2015-01-13 11:28:39 UTC (rev 178353)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2015-01-13 11:35:09 UTC (rev 178354)
</span><span class="lines">@@ -459,12 +459,10 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Element> element = createHTMLElement(token);
</span><span class="cx"> ASSERT(isHTMLFormElement(element.get()));
</span><del>- 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));
</del><ins>+ m_form = static_pointer_cast<HTMLFormElement>(element.release());
+ m_form->setDemoted(isDemoted);
+ attachLater(currentNode(), m_form);
+ m_openElements.push(HTMLStackItem::create(m_form, token));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLConstructionSite::insertHTMLElement(AtomicHTMLToken* token)
</span><span class="lines">@@ -624,11 +622,6 @@
</span><span class="cx"> return currentNode()->document();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool HTMLConstructionSite::insideTemplateElement()
-{
- return !ownerDocumentForCurrentNode().frame();
-}
-
</del><span class="cx"> PassRefPtr<Element> HTMLConstructionSite::createHTMLElement(AtomicHTMLToken* token)
</span><span class="cx"> {
</span><span class="cx"> QualifiedName tagName(nullAtom, token->name(), xhtmlNamespaceURI);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorehtmlparserHTMLConstructionSiteh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.h (178353 => 178354)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.h 2015-01-13 11:28:39 UTC (rev 178353)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/parser/HTMLConstructionSite.h 2015-01-13 11:35:09 UTC (rev 178354)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx"> HTMLStackItem* currentStackItem() const { return m_openElements.topStackItem(); }
</span><span class="cx"> HTMLStackItem* oneBelowTop() const { return m_openElements.oneBelowTop(); }
</span><span class="cx"> Document& ownerDocumentForCurrentNode();
</span><del>- bool insideTemplateElement();
</del><span class="cx"> HTMLElementStack* openElements() const { return &m_openElements; }
</span><span class="cx"> HTMLFormattingElementList* activeFormattingElements() const { return &m_activeFormattingElements; }
</span><span class="cx"> bool currentIsRootNode() { return m_openElements.topNode() == m_openElements.rootNode(); }
</span></span></pre>
</div>
</div>
</body>
</html>