<!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>[259500] branches/safari-609.2.1.2-branch/Source/WebCore</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/259500">259500</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2020-04-03 12:58:14 -0700 (Fri, 03 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/259244">r259244</a>. rdar://problem/61231864

    Assertion failure in HTMLFormElement::formElementIndex
    https://bugs.webkit.org/show_bug.cgi?id=209643

    Reviewed by Darin Adler.

    The bug was caused by FormAssociatedElement::findAssociatedForm finding a wrong form element
    when it's called on an element which appears later in the removed subtree.

    When we find the new form element to associate this element with, check to make sure its root
    element is that of the tree scope. This condition will be false if this element is in in the midst
    of being removed.

    * html/FormAssociatedElement.cpp:
    (WebCore::FormAssociatedElement::findAssociatedForm):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259244 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari609212branchSourceWebCoreChangeLog">branches/safari-609.2.1.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari609212branchSourceWebCorehtmlFormAssociatedElementcpp">branches/safari-609.2.1.2-branch/Source/WebCore/html/FormAssociatedElement.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari609212branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-609.2.1.2-branch/Source/WebCore/ChangeLog (259499 => 259500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-609.2.1.2-branch/Source/WebCore/ChangeLog        2020-04-03 19:58:11 UTC (rev 259499)
+++ branches/safari-609.2.1.2-branch/Source/WebCore/ChangeLog   2020-04-03 19:58:14 UTC (rev 259500)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2020-04-03  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r259244. rdar://problem/61231864
+
+    Assertion failure in HTMLFormElement::formElementIndex
+    https://bugs.webkit.org/show_bug.cgi?id=209643
+    
+    Reviewed by Darin Adler.
+    
+    The bug was caused by FormAssociatedElement::findAssociatedForm finding a wrong form element
+    when it's called on an element which appears later in the removed subtree.
+    
+    When we find the new form element to associate this element with, check to make sure its root
+    element is that of the tree scope. This condition will be false if this element is in in the midst
+    of being removed.
+    
+    * html/FormAssociatedElement.cpp:
+    (WebCore::FormAssociatedElement::findAssociatedForm):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-03-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+            Assertion failure in HTMLFormElement::formElementIndex
+            https://bugs.webkit.org/show_bug.cgi?id=209643
+
+            Reviewed by Darin Adler.
+
+            The bug was caused by FormAssociatedElement::findAssociatedForm finding a wrong form element
+            when it's called on an element which appears later in the removed subtree.
+
+            When we find the new form element to associate this element with, check to make sure its root
+            element is that of the tree scope. This condition will be false if this element is in in the midst
+            of being removed.
+
+            * html/FormAssociatedElement.cpp:
+            (WebCore::FormAssociatedElement::findAssociatedForm):
+
+2020-04-03  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r258799. rdar://problem/61231946
</span><span class="cx"> 
</span><span class="cx">     Content-Type & Nosniff Ignored on XML External Entity Resources
</span></span></pre></div>
<a id="branchessafari609212branchSourceWebCorehtmlFormAssociatedElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-609.2.1.2-branch/Source/WebCore/html/FormAssociatedElement.cpp (259499 => 259500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-609.2.1.2-branch/Source/WebCore/html/FormAssociatedElement.cpp   2020-04-03 19:58:11 UTC (rev 259499)
+++ branches/safari-609.2.1.2-branch/Source/WebCore/html/FormAssociatedElement.cpp      2020-04-03 19:58:14 UTC (rev 259500)
</span><span class="lines">@@ -108,9 +108,12 @@
</span><span class="cx">         // the value of form attribute, so we put the result of
</span><span class="cx">         // treeScope().getElementById() over the given element.
</span><span class="cx">         RefPtr<Element> newFormCandidate = element->treeScope().getElementById(formId);
</span><del>-        if (is<HTMLFormElement>(newFormCandidate))
</del><ins>+        if (!is<HTMLFormElement>(newFormCandidate))
+            return nullptr;
+        if (&element->traverseToRootNode() == &element->treeScope().rootNode()) {
+            ASSERT(&element->traverseToRootNode() == &newFormCandidate->traverseToRootNode());
</ins><span class="cx">             return downcast<HTMLFormElement>(newFormCandidate.get());
</span><del>-        return nullptr;
</del><ins>+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (!currentAssociatedForm)
</span></span></pre>
</div>
</div>

</body>
</html>