<!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>[203374] trunk</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/203374">203374</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-07-18 14:15:02 -0700 (Mon, 18 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/203373">r203373</a>.
Unaddressed
Reverted changeset:
"Don't associate form-associated elements with forms in other
trees."
https://bugs.webkit.org/show_bug.cgi?id=119451
http://trac.webkit.org/changeset/203373</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodeTraversalh">trunk/Source/WebCore/dom/NodeTraversal.h</a></li>
<li><a href="#trunkSourceWebCorehtmlFormAssociatedElementcpp">trunk/Source/WebCore/html/FormAssociatedElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsimagedisconnectedduringparseexpectedtxt">trunk/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsimagedisconnectedduringparsehtml">trunk/LayoutTests/fast/forms/image-disconnected-during-parse.html</a></li>
<li><a href="#trunkLayoutTestsfastformsinputdisconnectedduringparseexpectedtxt">trunk/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsinputdisconnectedduringparsehtml">trunk/LayoutTests/fast/forms/input-disconnected-during-parse.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/LayoutTests/ChangeLog 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-07-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r203373.
+
+ Unaddressed
+
+ Reverted changeset:
+
+ "Don't associate form-associated elements with forms in other
+ trees."
+ https://bugs.webkit.org/show_bug.cgi?id=119451
+ http://trac.webkit.org/changeset/203373
+
+2016-07-18 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> Don't associate form-associated elements with forms in other trees.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=119451
</span><span class="cx"> <rdar://problem/27382946>
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsimagedisconnectedduringparseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/LayoutTests/fast/forms/image-disconnected-during-parse-expected.txt 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-Image elements should not be associated with forms in different trees
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.forms[0].myimage is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastformsimagedisconnectedduringparsehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/forms/image-disconnected-during-parse.html (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/image-disconnected-during-parse.html 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/LayoutTests/fast/forms/image-disconnected-during-parse.html 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-<!DOCTYPE html>
-<form>
- <div id="target">
- <script>
- var d = document.getElementById('target');
- d.parentNode.removeChild(d);
- </script>
- <img name=myimage>
- </div>
-</form>
-<script src="../../resources/js-test-pre.js"></script>
-<script>
-description('Image elements should not be associated with forms in different trees');
-shouldBeUndefined('document.forms[0].myimage');
-</script>
-<script src="../../resources/js-test-post.js"></script>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsinputdisconnectedduringparseexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/LayoutTests/fast/forms/input-disconnected-during-parse-expected.txt 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-FormAssociatedElements should not be associated with forms in different trees (and should not crash)
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.forms[0].elements[0] is undefined.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastformsinputdisconnectedduringparsehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/forms/input-disconnected-during-parse.html (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/input-disconnected-during-parse.html 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/LayoutTests/fast/forms/input-disconnected-during-parse.html 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<!DOCTYPE html>
-<form>
- <div>
- <script>
- var d = document.querySelector('div');
- d.parentNode.removeChild(d);
- </script>
- <input>
- </div>
-</form>
-<script src="../../resources/js-test-pre.js"></script>
-<script>
-description('FormAssociatedElements should not be associated with forms in different trees (and should not crash)');
-var unused = document.forms[0].elements.length;
-d = null;
-gc();
-shouldBeUndefined('document.forms[0].elements[0]');
-</script>
-<script src="../../resources/js-test-post.js"></script>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/Source/WebCore/ChangeLog 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-07-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r203373.
+
+ Unaddressed
+
+ Reverted changeset:
+
+ "Don't associate form-associated elements with forms in other
+ trees."
+ https://bugs.webkit.org/show_bug.cgi?id=119451
+ http://trac.webkit.org/changeset/203373
+
+2016-07-18 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> Don't associate form-associated elements with forms in other trees.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=119451
</span><span class="cx"> <rdar://problem/27382946>
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeTraversalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeTraversal.h (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeTraversal.h 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/Source/WebCore/dom/NodeTraversal.h 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -22,7 +22,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef NodeTraversal_h
+#define NodeTraversal_h
</ins><span class="cx">
</span><span class="cx"> #include "ContainerNode.h"
</span><span class="cx"> #include "Text.h"
</span><span class="lines">@@ -64,7 +65,6 @@
</span><span class="cx"> Node* nextIncludingPseudo(const Node&, const Node* = nullptr);
</span><span class="cx"> Node* nextIncludingPseudoSkippingChildren(const Node&, const Node* = nullptr);
</span><span class="cx">
</span><del>-Node& highestAncestorOrSelf(Node&);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace NodeTraversal {
</span><span class="lines">@@ -127,13 +127,7 @@
</span><span class="cx"> return current.parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Node& highestAncestorOrSelf(Node& current)
-{
- Node* highest = &current;
- while (highest->parentNode())
- highest = highest->parentNode();
- return *highest;
</del><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><del>-}
-}
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlFormAssociatedElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FormAssociatedElement.cpp (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FormAssociatedElement.cpp 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/Source/WebCore/html/FormAssociatedElement.cpp 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLObjectElement.h"
</span><span class="cx"> #include "IdTargetObserver.h"
</span><del>-#include "NodeTraversal.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -76,9 +75,6 @@
</span><span class="cx"> m_formSetByParser = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_form && !NodeTraversal::highestAncestorOrSelf(insertionPoint).isSameNode(&NodeTraversal::highestAncestorOrSelf(*m_form)))
- setForm(nullptr);
-
</del><span class="cx"> if (!insertionPoint.inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (203373 => 203374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-07-18 21:12:14 UTC (rev 203373)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-07-18 21:15:02 UTC (rev 203374)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "MediaList.h"
</span><span class="cx"> #include "MediaQueryEvaluator.h"
</span><del>-#include "NodeTraversal.h"
</del><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -308,11 +307,6 @@
</span><span class="cx"> m_form->registerImgElement(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_form && !NodeTraversal::highestAncestorOrSelf(insertionPoint).isSameNode(&NodeTraversal::highestAncestorOrSelf(*m_form))) {
- m_form->removeImgElement(this);
- m_form = nullptr;
- }
-
</del><span class="cx"> if (!m_form) {
</span><span class="cx"> m_form = HTMLFormElement::findClosestFormAncestor(*this);
</span><span class="cx"> if (m_form)
</span></span></pre>
</div>
</div>
</body>
</html>