<!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>[169230] branches/safari-537.77-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/169230">169230</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 17:02:19 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/169007">r169007</a>. <rdar://problem/16975427></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestsChangeLog">branches/safari-537.77-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoredomElementcpp">branches/safari-537.77-branch/Source/WebCore/dom/Element.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestsfastdomremoveelementwithidthatwasinsertedonDOMNodeRemovedexpectedtxt">branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved-expected.txt</a></li>
<li><a href="#branchessafari53777branchLayoutTestsfastdomremoveelementwithidthatwasinsertedonDOMNodeRemovedhtml">branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html</a></li>
<li><a href="#branchessafari53777branchLayoutTestsfastdomremoveelementwithnamethatwasinsertedonDOMNodeRemovedexpectedtxt">branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved-expected.txt</a></li>
<li><a href="#branchessafari53777branchLayoutTestsfastdomremoveelementwithnamethatwasinsertedonDOMNodeRemovedhtml">branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/LayoutTests/ChangeLog (169229 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-22 23:57:46 UTC (rev 169229)
+++ branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-22 Dana Burkart <dburkart@apple.com>
+
+ Merge r169007
+
+ 2014-05-17 Maciej Stachowiak <mjs@apple.com>
+
+ Don't attempt to update id or name for nodes that are already removed
+ https://bugs.webkit.org/show_bug.cgi?id=133041
+
+ Reviewed by Sam Weinig.
+
+ Test originally by Dan Bates.
+
+ * fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved-expected.txt: Added.
+ * fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html: Added.
+ * fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved-expected.txt: Added.
+ * fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html: Added.
+
</ins><span class="cx"> 2014-05-22 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168915
</span></span></pre></div>
<a id="branchessafari53777branchLayoutTestsfastdomremoveelementwithidthatwasinsertedonDOMNodeRemovedexpectedtxtfromrev169007trunkLayoutTestsfastdomremoveelementwithidthatwasinsertedonDOMNodeRemovedexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved-expected.txt (from rev 169007, trunk/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved-expected.txt) (0 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved-expected.txt (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved-expected.txt 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS, removed element, with HTML attribute id, which was inserted on event DOMNodeRemoved.
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsfastdomremoveelementwithidthatwasinsertedonDOMNodeRemovedhtmlfromrev169007trunkLayoutTestsfastdomremoveelementwithidthatwasinsertedonDOMNodeRemovedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html (from rev 169007, trunk/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html) (0 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head></head> <!-- This element isn't necessary, but makes it straightforward to reason about the test when debugging it. -->
+<body id="declarativeBody"></body>
+<!-- Notice a <script> is only executed once. -->
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var savedDocumentElement;
+function appendBodyElementToSavedDocument()
+{
+ document.removeEventListener("DOMNodeRemoved", appendBodyElementToSavedDocument, false);
+ savedDocumentElement.appendChild(document.createElement("body")).id = "programmaticBody";
+}
+
+function insertSavedDocument()
+{
+ document.appendChild(savedDocumentElement); // Will execute <script id="script2">.
+}
+
+savedDocumentElement = document.documentElement;
+document.addEventListener("DOMNodeRemoved", appendBodyElementToSavedDocument, false);
+document.removeChild(savedDocumentElement); // Prevents <script id="script2"> from running since it won't be in the document when we fall off the end of this <script>.
+window.setTimeout(insertSavedDocument, 0);
+</script>
+<!-- This must be in its own <script> so that we execute it (for the first time) when we re-insert it into the document in insertSavedDocument(). -->
+<script id="script2">
+document.write("PASS, removed element, with HTML attribute id, which was inserted on event DOMNodeRemoved."); // Destroys the entire document, including <body id="declarativeBody"> and <body id="programmaticBody">.
+</script>
+</html>
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsfastdomremoveelementwithnamethatwasinsertedonDOMNodeRemovedexpectedtxtfromrev169007trunkLayoutTestsfastdomremoveelementwithnamethatwasinsertedonDOMNodeRemovedexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved-expected.txt (from rev 169007, trunk/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved-expected.txt) (0 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved-expected.txt (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved-expected.txt 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS, removed element, with HTML attribute name, which was inserted on event DOMNodeRemoved.
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsfastdomremoveelementwithnamethatwasinsertedonDOMNodeRemovedhtmlfromrev169007trunkLayoutTestsfastdomremoveelementwithnamethatwasinsertedonDOMNodeRemovedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html (from rev 169007, trunk/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html) (0 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head></head> <!-- This element isn't necessary, but makes it straightforward to reason about the test when debugging it. -->
+<body data-debug-name="declarativeBody"></body> <!-- This element isn't necessary, but makes it straightforward to reason about the test when debugging it. -->
+<!-- Notice a <script> is only executed once. -->
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var savedDocumentElement;
+function appendBodyElementToSavedDocument()
+{
+ document.removeEventListener("DOMNodeRemoved", appendBodyElementToSavedDocument, false);
+ savedDocumentElement.appendChild(document.createElement("body")).setAttribute("data-debug-name", "programmaticBody");
+}
+
+function insertSavedDocument()
+{
+ document.appendChild(savedDocumentElement); // Will execute <script id="script2">.
+}
+
+savedDocumentElement = document.documentElement;
+document.addEventListener("DOMNodeRemoved", appendBodyElementToSavedDocument, false);
+document.removeChild(savedDocumentElement); // Prevents <script id="script2"> from running since it won't be in the document when we fall off the end of this <script>.
+window.setTimeout(insertSavedDocument, 0);
+</script>
+<!-- This must be in its own <script> so that we execute it (for the first time) when we re-insert it into the document in insertSavedDocument(). -->
+<script id="script2">
+// [1] The array |elements| will either have the form {..., <body id="declarativeBody">, ...} or {..., <body id="declarativeBody">, ..., <body id="programmaticBody">, ...}.
+// The former will cause an assertion failure when we execute [2].
+var elements = document.querySelectorAll("*");
+for (var i = 0; i < elements.length; ++i)
+ elements[i].setAttribute("name", elements[i].nodeName);
+
+// [2] Destroy the entire document, including <body data-debug-name="declarativeBody"> and <body data-debug-name="programmaticBody">. Moving the
+// following line to its own <script> and altering the execution time of this page (say, by stepping through code in a WebCore debug session)
+// tends to affect the result of |elements| (see remark [1]).
+document.write("PASS, removed element, with HTML attribute name, which was inserted on event DOMNodeRemoved.");
+</script>
+</html>
</ins></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169229 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 23:57:46 UTC (rev 169229)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -66,6 +66,24 @@
</span><span class="cx">
</span><span class="cx"> 2014-05-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r169007
+
+ 2014-05-17 Maciej Stachowiak <mjs@apple.com>
+
+ Don't attempt to update id or name for nodes that are already removed
+ https://bugs.webkit.org/show_bug.cgi?id=133041
+
+ Reviewed by Sam Weinig.
+
+ Tests: fast/dom/remove-element-with-id-that-was-inserted-on-DOMNodeRemoved.html
+ fast/dom/remove-element-with-name-that-was-inserted-on-DOMNodeRemoved.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::removedFrom): Skip updating ids and names for an element not
+ in a treescope, as we already do for elements not in a document.
+
+2014-05-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r167856
</span><span class="cx">
</span><span class="cx"> 2014-04-27 Darin Adler <darin@apple.com>
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/dom/Element.cpp (169229 => 169230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/dom/Element.cpp 2014-05-22 23:57:46 UTC (rev 169229)
+++ branches/safari-537.77-branch/Source/WebCore/dom/Element.cpp 2014-05-23 00:02:19 UTC (rev 169230)
</span><span class="lines">@@ -1387,7 +1387,7 @@
</span><span class="cx"> if (insertionPoint->isInTreeScope()) {
</span><span class="cx"> TreeScope* oldScope = insertionPoint->treeScope();
</span><span class="cx"> HTMLDocument* oldDocument = inDocument() && oldScope->documentScope()->isHTMLDocument() ? toHTMLDocument(oldScope->documentScope()) : 0;
</span><del>- if (oldScope != treeScope())
</del><ins>+ if (oldScope != treeScope() || !isInTreeScope())
</ins><span class="cx"> oldScope = 0;
</span><span class="cx">
</span><span class="cx"> const AtomicString& idValue = getIdAttribute();
</span></span></pre>
</div>
</div>
</body>
</html>