<!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>[182656] 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/182656">182656</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-11 09:03:07 -0700 (Sat, 11 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit places caret in front of pasted Numbers cells instead of behind
https://bugs.webkit.org/show_bug.cgi?id=143627
Reviewed by Darin Adler.
The bug was caused by Position::downstream not respecting modern position types inside a table.
Fixed it by using Position::atStartOfNode which respects before/after positions.
This bug doesn't reproduce when there is no whitespace after td element in the pasted content
because positionAtEndOfInsertedContent() will be inside the last pasted cell inside
ReplaceSelectionCommand::completeHTMLReplacement in those cases. This related but separate bug
is tracked in https://webkit.org/b/143628.
Tests: editing/pasteboard/paste-table-with-unrendered-text-nodes.html
* dom/Position.cpp:
(WebCore::Position::downstream):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomPositioncpp">trunk/Source/WebCore/dom/Position.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingpasteboardpastetablewithunrenderedtextnodesexpectedtxt">trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpastetablewithunrenderedtextnodeshtml">trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestseditingpasteboardpastetablewithunrenderedtextnodesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt (0 => 182656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes-expected.txt 2015-04-11 16:03:07 UTC (rev 182656)
</span><span class="lines">@@ -0,0 +1,141 @@
</span><ins>+
+Initial state:
+| "line 1"
+| <br>
+| <br>
+
+After pasting line 2 (table A):
+| "line 1"
+| <br>
+| <table>
+| border="1"
+| "
+"
+| <tbody>
+| "
+"
+| <tr>
+| "
+"
+| <td>
+| "line 2 table A"
+| "
+"
+| "
+"
+| "
+"
+
+After typing ling 3:
+| "line 1"
+| <br>
+| <table>
+| border="1"
+| "
+"
+| <tbody>
+| "
+"
+| <tr>
+| "
+"
+| <td>
+| "line 2 table A"
+| "
+"
+| "
+"
+| "
+"
+| "line 3<#selection-caret>"
+
+After pasting ling 4 (table B):
+| "line 1"
+| <br>
+| <table>
+| border="1"
+| "
+"
+| <tbody>
+| "
+"
+| <tr>
+| "
+"
+| <td>
+| "line 2 table A"
+| "
+"
+| "
+"
+| "
+"
+| "line 3"
+| <table>
+| border="1"
+| "
+"
+| <tbody>
+| "
+"
+| <tr>
+| "
+"
+| <td>
+| "line 4"
+| "
+"
+| <td>
+| "table B"
+| "
+"
+| "
+"
+| "
+"
+
+After typing ling 5:
+| "line 1"
+| <br>
+| <table>
+| border="1"
+| "
+"
+| <tbody>
+| "
+"
+| <tr>
+| "
+"
+| <td>
+| "line 2 table A"
+| "
+"
+| "
+"
+| "
+"
+| "line 3"
+| <table>
+| border="1"
+| "
+"
+| <tbody>
+| "
+"
+| <tr>
+| "
+"
+| <td>
+| "line 4"
+| "
+"
+| <td>
+| "table B"
+| "
+"
+| "
+"
+| "
+"
+| "line 5<#selection-caret>"
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpastetablewithunrenderedtextnodeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes.html (0 => 182656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-table-with-unrendered-text-nodes.html 2015-04-11 16:03:07 UTC (rev 182656)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests pasting a table with a new line character between each element.
+The caret should appear after the table, not before, upon paste.</p>
+<div id="editor" contenteditable>line 1<br><br></div>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+
+var editor = document.getElementById('editor');
+editor.focus();
+getSelection().collapse(editor, editor.childNodes.length);
+Markup.dump(editor, 'Initial state');
+
+document.execCommand('insertHTML', false, '<table border=1>\n<tbody>\n<tr>\n<td>line 2 table A</td>\n</tr>\n</tbody>\n</table>\n');
+Markup.dump(editor, 'After pasting line 2 (table A)');
+
+document.execCommand('insertText', false, 'line 3');
+Markup.dump(editor, 'After typing ling 3');
+
+document.execCommand('insertHTML', false, '<table border=1>\n<tbody>\n<tr>\n<td>line 4</td>\n<td>table B</td>\n</tr>\n</tbody>\n</table>\n');
+Markup.dump(editor, 'After pasting ling 4 (table B)');
+
+document.execCommand('insertText', false, 'line 5');
+Markup.dump(editor, 'After typing ling 5');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182655 => 182656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-11 14:40:22 UTC (rev 182655)
+++ trunk/Source/WebCore/ChangeLog 2015-04-11 16:03:07 UTC (rev 182656)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-11 Ryosuke Niwa <rniwa@webkit.org>
+
+ WebKit places caret in front of pasted Numbers cells instead of behind
+ https://bugs.webkit.org/show_bug.cgi?id=143627
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by Position::downstream not respecting modern position types inside a table.
+ Fixed it by using Position::atStartOfNode which respects before/after positions.
+
+ This bug doesn't reproduce when there is no whitespace after td element in the pasted content
+ because positionAtEndOfInsertedContent() will be inside the last pasted cell inside
+ ReplaceSelectionCommand::completeHTMLReplacement in those cases. This related but separate bug
+ is tracked in https://webkit.org/b/143628.
+
+ Tests: editing/pasteboard/paste-table-with-unrendered-text-nodes.html
+
+ * dom/Position.cpp:
+ (WebCore::Position::downstream):
+
</ins><span class="cx"> 2015-04-11 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Enable Symbol in web pages
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (182655 => 182656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp 2015-04-11 14:40:22 UTC (rev 182655)
+++ trunk/Source/WebCore/dom/Position.cpp 2015-04-11 16:03:07 UTC (rev 182656)
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx">
</span><span class="cx"> // Return position before tables and nodes which have content that can be ignored.
</span><span class="cx"> if (editingIgnoresContent(currentNode) || isRenderedTable(currentNode)) {
</span><del>- if (currentPos.offsetInLeafNode() <= renderer->caretMinOffset())
</del><ins>+ if (currentPos.atStartOfNode())
</ins><span class="cx"> return positionBeforeNode(currentNode);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>