<!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>[189610] branches/safari-601-branch</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/189610">189610</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-11 00:01:44 -0700 (Fri, 11 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/189469">r189469</a>. rdar://problem/22316524</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlFormAssociatedElementcpp">branches/safari-601-branch/Source/WebCore/html/FormAssociatedElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLFormControlElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLFormControlElementh">branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLInputElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLInputElementh">branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLObjectElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLObjectElementh">branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLSelectElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLTextFormControlElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure2expectedtxt">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure2html">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure3expectedtxt">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure3html">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure4expectedtxt">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure4html">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailureexpectedtxt">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailurehtml">branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-09-10 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189469.
+
+ 2015-09-07 Daniel Bates <dabates@apple.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION in WebCore::DocumentOrderedMap::get(); update form
+ association after subtree insertion
+ https://bugs.webkit.org/show_bug.cgi?id=148919
+ <rdar://problem/21868036>
+
+ Reviewed by Andy Estes.
+
+ Add tests to ensure that updating the form association of a form control in a subtree
+ does not cause an assertion failure.
+
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2-expected.txt: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3-expected.txt: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4-expected.txt: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure-expected.txt: Added.
+ * fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html: Added.
+
</ins><span class="cx"> 2015-09-10 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Test result gardening.
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure2expectedtxtfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure2expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2-expected.txt (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2-expected.txt) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2-expected.txt 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+PASS, this test did not cause an assertion failure.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure2htmlfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure2html"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div id="container"></div>
+<div id="subtreeToMove">
+ <object form="A"></object>
+ <div id="A"></div>
+</div>
+<div id="A"></div>
+<p>PASS, this test did not cause an assertion failure.</p>
+<script>
+var container = document.getElementById("container");
+var subtreeToMove = document.getElementById("subtreeToMove");
+container.appendChild(subtreeToMove);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure3expectedtxtfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure3expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3-expected.txt (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3-expected.txt) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3-expected.txt 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+PASS, this test did not cause an assertion failure.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure3htmlfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure3html"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div id="container"></div>
+<div id="subtreeToMove">
+ <select form="A"></select>
+ <div id="A"></div>
+</div>
+<div id="A"></div>
+<p>PASS, this test did not cause an assertion failure.</p>
+<script>
+var container = document.getElementById("container");
+var subtreeToMove = document.getElementById("subtreeToMove");
+container.appendChild(subtreeToMove);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure4expectedtxtfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure4expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4-expected.txt (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4-expected.txt) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4-expected.txt 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+PASS, this test did not cause an assertion failure.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure4htmlfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailure4html"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div id="container"></div>
+<div id="subtreeToMove">
+ <input type="text" form="A">
+ <div id="A"></div>
+</div>
+<div id="A"></div>
+<p>PASS, this test did not cause an assertion failure.</p>
+<script>
+var container = document.getElementById("container");
+var subtreeToMove = document.getElementById("subtreeToMove");
+container.appendChild(subtreeToMove);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailureexpectedtxtfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailureexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-expected.txt (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-expected.txt) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure-expected.txt 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+PASS, this test did not cause an assertion failure.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailurehtmlfromrev189469trunkLayoutTestsfastformsupdateformownerinmovedsubtreeassertionfailurehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html (from rev 189469, trunk/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html) (0 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div id="container"></div>
+<div id="subtreeToMove">
+ <keygen form="A">
+ <select id="A"></select>
+</div>
+<div id="A"></div>
+<p>PASS, this test did not cause an assertion failure.</p>
+<script>
+var container = document.getElementById("container");
+var subtreeToMove = document.getElementById("subtreeToMove");
+container.appendChild(subtreeToMove);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-09-10 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189469.
+
+ 2015-09-07 Daniel Bates <dabates@apple.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION in WebCore::DocumentOrderedMap::get(); update form
+ association after subtree insertion
+ https://bugs.webkit.org/show_bug.cgi?id=148919
+ <rdar://problem/21868036>
+
+ Reviewed by Andy Estes.
+
+ Currently we update the form association of a form control upon insertion into
+ the document. Instead we should update the form association of a form control
+ after its containing subtree is inserted into the document to avoid an assertion
+ failure when the containing subtree has an element whose id is identical to both
+ the id of some other element in the document and the name of the form referenced
+ by the inserted form control.
+
+ Tests: fast/forms/update-form-owner-in-moved-subtree-assertion-failure-2.html
+ fast/forms/update-form-owner-in-moved-subtree-assertion-failure-3.html
+ fast/forms/update-form-owner-in-moved-subtree-assertion-failure-4.html
+ fast/forms/update-form-owner-in-moved-subtree-assertion-failure.html
+
+ * html/FormAssociatedElement.cpp:
+ (WebCore::FormAssociatedElement::insertedInto): Moved resetFormOwner() from here
+ to {HTMLFormControlElement, HTMLObjectElement}::finishedInsertingSubtree().
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::insertedInto): Return InsertionShouldCallFinishedInsertingSubtree
+ so that HTMLFormControlElement::finishedInsertingSubtree() is called.
+ (WebCore::HTMLFormControlElement::finishedInsertingSubtree): Added; turn around and
+ call FormAssociatedElement::resetFormOwner().
+ * html/HTMLFormControlElement.h:
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::insertedInto): Return InsertionShouldCallFinishedInsertingSubtree so
+ that HTMLInputElement::finishedInsertingSubtree() is called and move logic to update radio button
+ group from here...
+ (WebCore::HTMLInputElement::finishedInsertingSubtree): to here.
+ * html/HTMLInputElement.h:
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::insertedInto): Return InsertionShouldCallFinishedInsertingSubtree so
+ that HTMLObjectElement::finishedInsertingSubtree() is called.
+ (WebCore::HTMLObjectElement::finishedInsertingSubtree): Added; turn around and
+ call FormAssociatedElement::resetFormOwner().
+ * html/HTMLObjectElement.h:
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::insertedInto): Modified to return the result of
+ HTMLFormControlElementWithState::insertedInto(), which may schedule a callback after subtree
+ insertion.
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::insertedInto): Ditto.
+
</ins><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r189167.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlFormAssociatedElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/FormAssociatedElement.cpp (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/FormAssociatedElement.cpp 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/FormAssociatedElement.cpp 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx">
</span><span class="cx"> void FormAssociatedElement::insertedInto(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><del>- resetFormOwner();
</del><span class="cx"> if (!insertionPoint.inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.cpp (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.cpp 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.cpp 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -260,8 +260,12 @@
</span><span class="cx"> setNeedsWillValidateCheck();
</span><span class="cx"> HTMLElement::insertedInto(insertionPoint);
</span><span class="cx"> FormAssociatedElement::insertedInto(insertionPoint);
</span><ins>+ return InsertionShouldCallFinishedInsertingSubtree;
+}
</ins><span class="cx">
</span><del>- return InsertionDone;
</del><ins>+void HTMLFormControlElement::finishedInsertingSubtree()
+{
+ resetFormOwner();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormControlElement::removedFrom(ContainerNode& insertionPoint)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLFormControlElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.h (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.h 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLFormControlElement.h 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> virtual void requiredAttributeChanged();
</span><span class="cx"> virtual void didAttachRenderers() override;
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
</span><ins>+ void finishedInsertingSubtree() override;
</ins><span class="cx"> virtual void removedFrom(ContainerNode&) override;
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.cpp (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.cpp 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.cpp 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -1473,14 +1473,19 @@
</span><span class="cx"> Node::InsertionNotificationRequest HTMLInputElement::insertedInto(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><span class="cx"> HTMLTextFormControlElement::insertedInto(insertionPoint);
</span><del>- if (insertionPoint.inDocument() && !form())
- addToRadioButtonGroup();
</del><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> resetListAttributeTargetObserver();
</span><span class="cx"> #endif
</span><del>- return InsertionDone;
</del><ins>+ return InsertionShouldCallFinishedInsertingSubtree;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLInputElement::finishedInsertingSubtree()
+{
+ HTMLTextFormControlElement::finishedInsertingSubtree();
+ if (inDocument() && !form())
+ addToRadioButtonGroup();
+}
+
</ins><span class="cx"> void HTMLInputElement::removedFrom(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><span class="cx"> if (insertionPoint.inDocument() && !form())
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.h (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.h 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLInputElement.h 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -335,6 +335,7 @@
</span><span class="cx"> virtual void willChangeForm() override final;
</span><span class="cx"> virtual void didChangeForm() override final;
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) override final;
</span><ins>+ void finishedInsertingSubtree() override final;
</ins><span class="cx"> virtual void removedFrom(ContainerNode&) override final;
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override final;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.cpp (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.cpp 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.cpp 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -337,9 +337,14 @@
</span><span class="cx"> {
</span><span class="cx"> HTMLPlugInImageElement::insertedInto(insertionPoint);
</span><span class="cx"> FormAssociatedElement::insertedInto(insertionPoint);
</span><del>- return InsertionDone;
</del><ins>+ return InsertionShouldCallFinishedInsertingSubtree;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLObjectElement::finishedInsertingSubtree()
+{
+ resetFormOwner();
+}
+
</ins><span class="cx"> void HTMLObjectElement::removedFrom(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><span class="cx"> HTMLPlugInImageElement::removedFrom(insertionPoint);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLObjectElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.h (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.h 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLObjectElement.h 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
</span><span class="cx">
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
</span><ins>+ void finishedInsertingSubtree() override final;
</ins><span class="cx"> virtual void removedFrom(ContainerNode&) override;
</span><span class="cx">
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLSelectElement.cpp (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLSelectElement.cpp 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLSelectElement.cpp 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -1591,8 +1591,7 @@
</span><span class="cx"> // items yet - but for innerHTML and related methods, this method is called
</span><span class="cx"> // after the whole subtree is constructed.
</span><span class="cx"> recalcListItems();
</span><del>- HTMLFormControlElementWithState::insertedInto(insertionPoint);
- return InsertionDone;
</del><ins>+ return HTMLFormControlElementWithState::insertedInto(insertionPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLSelectElement::accessKeySetSelectedIndex(int index)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp (189609 => 189610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp 2015-09-11 07:01:26 UTC (rev 189609)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp 2015-09-11 07:01:44 UTC (rev 189610)
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx">
</span><span class="cx"> Node::InsertionNotificationRequest HTMLTextFormControlElement::insertedInto(ContainerNode& insertionPoint)
</span><span class="cx"> {
</span><del>- HTMLFormControlElementWithState::insertedInto(insertionPoint);
</del><ins>+ InsertionNotificationRequest insertionNotificationRequest = HTMLFormControlElementWithState::insertedInto(insertionPoint);
</ins><span class="cx"> if (!insertionPoint.inDocument())
</span><del>- return InsertionDone;
</del><ins>+ return insertionNotificationRequest;
</ins><span class="cx"> String initialValue = value();
</span><span class="cx"> setTextAsOfLastFormControlChangeEvent(initialValue.isNull() ? emptyString() : initialValue);
</span><del>- return InsertionDone;
</del><ins>+ return insertionNotificationRequest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextFormControlElement::dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection direction)
</span></span></pre>
</div>
</div>
</body>
</html>