<!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>[189653] 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/189653">189653</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-12 10:33:52 -0700 (Sat, 12 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ChildNode.replaceWith() without argument should replace the node with an empty DocumentFragment
https://bugs.webkit.org/show_bug.cgi?id=149073
<rdar://problem/22547801>
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/dom/nodes/ChildNode-replaceWith-expected.txt:
Source/WebCore:
ChildNode.replaceWith() without argument should replace the node with
an empty DocumentFragment, as per the specification:
https://dom.spec.whatwg.org/#dom-childnode-replacewith
https://dom.spec.whatwg.org/#converting-nodes-into-a-node
Previously, WebKit did not do anything in this case. This patch fixes
it.
No new tests, already covered by existing test.
* dom/Node.cpp:
(WebCore::Node::replaceWith):
LayoutTests:
Fix / rebaseline test now that our behavior has changed.
* fast/dom/ChildNode-replaceWith-expected.txt:
* fast/dom/ChildNode-replaceWith.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodereplaceWithexpectedtxt">trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomChildNodereplaceWithhtml">trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomnodesChildNodereplaceWithexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/ChildNode-replaceWith-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/LayoutTests/ChangeLog 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-12 Chris Dumez <cdumez@apple.com>
+
+ ChildNode.replaceWith() without argument should replace the node with an empty DocumentFragment
+ https://bugs.webkit.org/show_bug.cgi?id=149073
+ <rdar://problem/22547801>
+
+ Reviewed by Ryosuke Niwa.
+
+ Fix / rebaseline test now that our behavior has changed.
+
+ * fast/dom/ChildNode-replaceWith-expected.txt:
+ * fast/dom/ChildNode-replaceWith.html:
+
</ins><span class="cx"> 2015-09-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark http/tests/cache/disk-cache/disk-cache-cancel.html as flaky for
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodereplaceWithexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/LayoutTests/fast/dom/ChildNode-replaceWith-expected.txt 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> Test Element.replaceWith((Node or DOMString)...).
</span><span class="cx"> Test with no arguments.
</span><del>-PASS parent.childNodes.length is 1
</del><ins>+PASS parent.childNodes.length is 0
</ins><span class="cx">
</span><span class="cx"> Test with a single element.
</span><span class="cx"> PASS parent.childNodes.length is 1
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> Test Text.replaceWith((Node or DOMString)...).
</span><span class="cx"> Test with no arguments.
</span><del>-PASS parent.childNodes.length is 1
</del><ins>+PASS parent.childNodes.length is 0
</ins><span class="cx">
</span><span class="cx"> Test with a single element.
</span><span class="cx"> PASS parent.childNodes.length is 1
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> Test Comment.replaceWith((Node or DOMString)...).
</span><span class="cx"> Test with no arguments.
</span><del>-PASS parent.childNodes.length is 1
</del><ins>+PASS parent.childNodes.length is 0
</ins><span class="cx">
</span><span class="cx"> Test with a single element.
</span><span class="cx"> PASS parent.childNodes.length is 1
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomChildNodereplaceWithhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/LayoutTests/fast/dom/ChildNode-replaceWith.html 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> child = createChild();
</span><span class="cx"> parent.appendChild(child);
</span><span class="cx"> child.replaceWith();
</span><del>- shouldBe("parent.childNodes.length", "1");
</del><ins>+ shouldBe("parent.childNodes.length", "0");
</ins><span class="cx"> debug("");
</span><span class="cx">
</span><span class="cx"> debug("Test with a single element.");
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-09-12 Chris Dumez <cdumez@apple.com>
+
+ ChildNode.replaceWith() without argument should replace the node with an empty DocumentFragment
+ https://bugs.webkit.org/show_bug.cgi?id=149073
+ <rdar://problem/22547801>
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/dom/nodes/ChildNode-replaceWith-expected.txt:
+
</ins><span class="cx"> 2015-09-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> DOMTokenList update steps for classList don't follow the spec
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomnodesChildNodereplaceWithexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/ChildNode-replaceWith-expected.txt (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/ChildNode-replaceWith-expected.txt 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/ChildNode-replaceWith-expected.txt 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-FAIL Comment.replaceWith() without any argument. assert_equals: expected "" but got "<!--test-->"
</del><ins>+PASS Comment.replaceWith() without any argument.
</ins><span class="cx"> PASS Comment.replaceWith() with null as an argument.
</span><span class="cx"> PASS Comment.replaceWith() with undefined as an argument.
</span><span class="cx"> PASS Comment.replaceWith() with empty string as an argument.
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> PASS Comment.replaceWith() with one sibling of child and child itself as arguments.
</span><span class="cx"> PASS Comment.replaceWith() with one element and text as arguments.
</span><span class="cx"> PASS Comment.replaceWith() on a parentless child with two elements as arguments.
</span><del>-FAIL Element.replaceWith() without any argument. assert_equals: expected "" but got "<test></test>"
</del><ins>+PASS Element.replaceWith() without any argument.
</ins><span class="cx"> PASS Element.replaceWith() with null as an argument.
</span><span class="cx"> PASS Element.replaceWith() with undefined as an argument.
</span><span class="cx"> PASS Element.replaceWith() with empty string as an argument.
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> PASS Element.replaceWith() with one sibling of child and child itself as arguments.
</span><span class="cx"> PASS Element.replaceWith() with one element and text as arguments.
</span><span class="cx"> PASS Element.replaceWith() on a parentless child with two elements as arguments.
</span><del>-FAIL Text.replaceWith() without any argument. assert_equals: expected "" but got "test"
</del><ins>+PASS Text.replaceWith() without any argument.
</ins><span class="cx"> PASS Text.replaceWith() with null as an argument.
</span><span class="cx"> PASS Text.replaceWith() with undefined as an argument.
</span><span class="cx"> PASS Text.replaceWith() with empty string as an argument.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/Source/WebCore/ChangeLog 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-09-12 Chris Dumez <cdumez@apple.com>
+
+ ChildNode.replaceWith() without argument should replace the node with an empty DocumentFragment
+ https://bugs.webkit.org/show_bug.cgi?id=149073
+ <rdar://problem/22547801>
+
+ Reviewed by Ryosuke Niwa.
+
+ ChildNode.replaceWith() without argument should replace the node with
+ an empty DocumentFragment, as per the specification:
+ https://dom.spec.whatwg.org/#dom-childnode-replacewith
+ https://dom.spec.whatwg.org/#converting-nodes-into-a-node
+
+ Previously, WebKit did not do anything in this case. This patch fixes
+ it.
+
+ No new tests, already covered by existing test.
+
+ * dom/Node.cpp:
+ (WebCore::Node::replaceWith):
+
</ins><span class="cx"> 2015-09-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove all uses of PassRefPtr in WebCore/plugins
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (189652 => 189653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2015-09-12 15:58:20 UTC (rev 189652)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-09-12 17:33:52 UTC (rev 189653)
</span><span class="lines">@@ -560,12 +560,15 @@
</span><span class="cx"> auto viableNextSibling = firstFollowingSiblingNotInNodeSet(*this, nodeSet);
</span><span class="cx">
</span><span class="cx"> auto node = convertNodesOrStringsIntoNode(*this, WTF::move(nodeOrStringVector), ec);
</span><del>- if (ec || !node)
</del><ins>+ if (ec)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (parentNode() == parent)
- parent->replaceChild(node.releaseNonNull(), *this, ec);
- else
</del><ins>+ if (parentNode() == parent) {
+ if (node)
+ parent->replaceChild(node.releaseNonNull(), *this, ec);
+ else
+ parent->removeChild(*this);
+ } else if (node)
</ins><span class="cx"> parent->insertBefore(node.releaseNonNull(), viableNextSibling.get(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>