<!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>[204311] 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/204311">204311</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-09 15:30:46 -0700 (Tue, 09 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Calling splitText() on a parent-less Text node should update associated ranges
https://bugs.webkit.org/show_bug.cgi?id=160710
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/dom/ranges/Range-mutations-expected.txt:
Source/WebCore:
Calling splitText() on a parent-less Text node should update associated ranges:
- https://dom.spec.whatwg.org/#concept-text-split (Step 9)
Previously, we would only update ranges for Text nodes that have a parent.
No new tests, rebaselined existing test.
* dom/Range.cpp:
(WebCore::boundaryTextNodesSplit):
(WebCore::Range::textNodeSplit): Deleted.
* dom/Text.cpp:
(WebCore::Text::splitText):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomrangesRangemutationsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/ranges/Range-mutations-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204310 => 204311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-09 22:25:37 UTC (rev 204310)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-09 22:30:46 UTC (rev 204311)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-09 Chris Dumez <cdumez@apple.com>
+
+ Calling splitText() on a parent-less Text node should update associated ranges
+ https://bugs.webkit.org/show_bug.cgi?id=160710
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/dom/ranges/Range-mutations-expected.txt:
+
</ins><span class="cx"> 2016-08-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be possible to re-initialize an Event after it's been dispatched
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomrangesRangemutationsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/ranges/Range-mutations-expected.txt (204310 => 204311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/ranges/Range-mutations-expected.txt 2016-08-09 22:25:37 UTC (rev 204310)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/ranges/Range-mutations-expected.txt 2016-08-09 22:30:46 UTC (rev 204311)
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx"> FAIL detachedTextNode.splitText(1), with selected range collapsed at (detachedTextNode, 1) assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="cx"> PASS detachedTextNode.splitText(detachedTextNode.length), with unselected range collapsed at (detachedTextNode, detachedTextNode.length)
</span><span class="cx"> FAIL detachedTextNode.splitText(detachedTextNode.length), with selected range collapsed at (detachedTextNode, detachedTextNode.length) assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><del>-FAIL detachedTextNode.splitText(1), with unselected range on detachedTextNode from 1 to 3 assert_equals: Wrong end offset expected 1 but got 3
</del><ins>+PASS detachedTextNode.splitText(1), with unselected range on detachedTextNode from 1 to 3
</ins><span class="cx"> FAIL detachedTextNode.splitText(1), with selected range on detachedTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><del>-FAIL detachedTextNode.splitText(2), with unselected range on detachedTextNode from 1 to 3 assert_equals: Wrong end offset expected 2 but got 3
</del><ins>+PASS detachedTextNode.splitText(2), with unselected range on detachedTextNode from 1 to 3
</ins><span class="cx"> FAIL detachedTextNode.splitText(2), with selected range on detachedTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="cx"> PASS detachedTextNode.splitText(3), with unselected range on detachedTextNode from 1 to 3
</span><span class="cx"> FAIL detachedTextNode.splitText(3), with selected range on detachedTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="lines">@@ -77,9 +77,9 @@
</span><span class="cx"> FAIL detachedForeignTextNode.splitText(1), with selected range collapsed at (detachedForeignTextNode, 1) assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="cx"> PASS detachedForeignTextNode.splitText(detachedForeignTextNode.length), with unselected range collapsed at (detachedForeignTextNode, detachedForeignTextNode.length)
</span><span class="cx"> FAIL detachedForeignTextNode.splitText(detachedForeignTextNode.length), with selected range collapsed at (detachedForeignTextNode, detachedForeignTextNode.length) assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><del>-FAIL detachedForeignTextNode.splitText(1), with unselected range on detachedForeignTextNode from 1 to 3 assert_equals: Wrong end offset expected 1 but got 3
</del><ins>+PASS detachedForeignTextNode.splitText(1), with unselected range on detachedForeignTextNode from 1 to 3
</ins><span class="cx"> FAIL detachedForeignTextNode.splitText(1), with selected range on detachedForeignTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><del>-FAIL detachedForeignTextNode.splitText(2), with unselected range on detachedForeignTextNode from 1 to 3 assert_equals: Wrong end offset expected 2 but got 3
</del><ins>+PASS detachedForeignTextNode.splitText(2), with unselected range on detachedForeignTextNode from 1 to 3
</ins><span class="cx"> FAIL detachedForeignTextNode.splitText(2), with selected range on detachedForeignTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="cx"> PASS detachedForeignTextNode.splitText(3), with unselected range on detachedForeignTextNode from 1 to 3
</span><span class="cx"> FAIL detachedForeignTextNode.splitText(3), with selected range on detachedForeignTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="lines">@@ -91,9 +91,9 @@
</span><span class="cx"> FAIL detachedXmlTextNode.splitText(1), with selected range collapsed at (detachedXmlTextNode, 1) assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="cx"> PASS detachedXmlTextNode.splitText(detachedXmlTextNode.length), with unselected range collapsed at (detachedXmlTextNode, detachedXmlTextNode.length)
</span><span class="cx"> FAIL detachedXmlTextNode.splitText(detachedXmlTextNode.length), with selected range collapsed at (detachedXmlTextNode, detachedXmlTextNode.length) assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><del>-FAIL detachedXmlTextNode.splitText(1), with unselected range on detachedXmlTextNode from 1 to 3 assert_equals: Wrong end offset expected 1 but got 3
</del><ins>+PASS detachedXmlTextNode.splitText(1), with unselected range on detachedXmlTextNode from 1 to 3
</ins><span class="cx"> FAIL detachedXmlTextNode.splitText(1), with selected range on detachedXmlTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><del>-FAIL detachedXmlTextNode.splitText(2), with unselected range on detachedXmlTextNode from 1 to 3 assert_equals: Wrong end offset expected 2 but got 3
</del><ins>+PASS detachedXmlTextNode.splitText(2), with unselected range on detachedXmlTextNode from 1 to 3
</ins><span class="cx"> FAIL detachedXmlTextNode.splitText(2), with selected range on detachedXmlTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span><span class="cx"> PASS detachedXmlTextNode.splitText(3), with unselected range on detachedXmlTextNode from 1 to 3
</span><span class="cx"> FAIL detachedXmlTextNode.splitText(3), with selected range on detachedXmlTextNode from 1 to 3 assert_equals: Sanity check: selection must have exactly one range after adding the range expected 1 but got 0
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204310 => 204311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-09 22:25:37 UTC (rev 204310)
+++ trunk/Source/WebCore/ChangeLog 2016-08-09 22:30:46 UTC (rev 204311)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-08-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Calling splitText() on a parent-less Text node should update associated ranges
+ https://bugs.webkit.org/show_bug.cgi?id=160710
+
+ Reviewed by Ryosuke Niwa.
+
+ Calling splitText() on a parent-less Text node should update associated ranges:
+ - https://dom.spec.whatwg.org/#concept-text-split (Step 9)
+
+ Previously, we would only update ranges for Text nodes that have a parent.
+
+ No new tests, rebaselined existing test.
+
+ * dom/Range.cpp:
+ (WebCore::boundaryTextNodesSplit):
+ (WebCore::Range::textNodeSplit): Deleted.
+ * dom/Text.cpp:
+ (WebCore::Text::splitText):
+
+2016-08-09 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop unused NodeListsNodeData::isEmpty()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160704
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (204310 => 204311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2016-08-09 22:25:37 UTC (rev 204310)
+++ trunk/Source/WebCore/dom/Range.cpp 2016-08-09 22:30:46 UTC (rev 204311)
</span><span class="lines">@@ -1667,14 +1667,20 @@
</span><span class="cx">
</span><span class="cx"> static inline void boundaryTextNodesSplit(RangeBoundaryPoint& boundary, Text* oldNode)
</span><span class="cx"> {
</span><ins>+ auto* parent = oldNode->parentNode();
</ins><span class="cx"> if (boundary.container() == oldNode) {
</span><span class="cx"> unsigned splitOffset = oldNode->length();
</span><span class="cx"> unsigned boundaryOffset = boundary.offset();
</span><del>- if (boundaryOffset > splitOffset)
- boundary.set(*oldNode->nextSibling(), boundaryOffset - splitOffset, 0);
</del><ins>+ if (boundaryOffset > splitOffset) {
+ if (parent)
+ boundary.set(*oldNode->nextSibling(), boundaryOffset - splitOffset, 0);
+ else
+ boundary.setOffset(splitOffset);
+ }
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- auto* parent = oldNode->parentNode();
</del><ins>+ if (!parent)
+ return;
</ins><span class="cx"> if (boundary.container() == parent && boundary.childBefore() == oldNode) {
</span><span class="cx"> auto* newChild = oldNode->nextSibling();
</span><span class="cx"> ASSERT(newChild);
</span><span class="lines">@@ -1686,7 +1692,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(oldNode);
</span><span class="cx"> ASSERT(&oldNode->document() == &ownerDocument());
</span><del>- ASSERT(oldNode->parentNode());
</del><span class="cx"> ASSERT(oldNode->isTextNode());
</span><span class="cx"> ASSERT(oldNode->nextSibling());
</span><span class="cx"> ASSERT(oldNode->nextSibling()->isTextNode());
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (204310 => 204311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2016-08-09 22:25:37 UTC (rev 204310)
+++ trunk/Source/WebCore/dom/Text.cpp 2016-08-09 22:30:46 UTC (rev 204311)
</span><span class="lines">@@ -79,8 +79,7 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (parentNode())
- document().textNodeSplit(this);
</del><ins>+ document().textNodeSplit(this);
</ins><span class="cx">
</span><span class="cx"> if (renderer())
</span><span class="cx"> renderer()->setTextWithOffset(data(), 0, oldStr.length());
</span></span></pre>
</div>
</div>
</body>
</html>