<!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>[145871] 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/145871">145871</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-03-14 21:25:27 -0700 (Thu, 14 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Backspace/delete at start of table cell shouldn't step out of cell
https://bugs.webkit.org/show_bug.cgi?id=35372

Patch by Shezan Baig &lt;sbaig1@bloomberg.net&gt; on 2013-03-14
Reviewed by Ryosuke Niwa.

Source/WebCore:

Make Delete and ForwardDelete commands be no-ops if we are at the first
position or last position of a table cell respectively.

Tests: editing/deleting/backspace-at-table-cell-beginning.html
       editing/deleting/forward-delete-at-table-cell-ending.html

* editing/TypingCommand.cpp:
(WebCore::TypingCommand::deleteKeyPressed):
(WebCore::TypingCommand::forwardDeleteKeyPressed):

LayoutTests:

* editing/deleting/backspace-at-table-cell-beginning-expected.txt: Added.
* editing/deleting/backspace-at-table-cell-beginning.html: Added.
* editing/deleting/forward-delete-at-table-cell-ending-expected.txt: Added.
* editing/deleting/forward-delete-at-table-cell-ending.html: Added.</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="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingdeletingbackspaceattablecellbeginningexpectedtxt">trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingdeletingbackspaceattablecellbeginninghtml">trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning.html</a></li>
<li><a href="#trunkLayoutTestseditingdeletingforwarddeleteattablecellendingexpectedtxt">trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingdeletingforwarddeleteattablecellendinghtml">trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (145870 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-03-15 03:37:06 UTC (rev 145870)
+++ trunk/LayoutTests/ChangeLog        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-03-14  Shezan Baig  &lt;sbaig1@bloomberg.net&gt;
+
+        Backspace/delete at start of table cell shouldn't step out of cell
+        https://bugs.webkit.org/show_bug.cgi?id=35372
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/deleting/backspace-at-table-cell-beginning-expected.txt: Added.
+        * editing/deleting/backspace-at-table-cell-beginning.html: Added.
+        * editing/deleting/forward-delete-at-table-cell-ending-expected.txt: Added.
+        * editing/deleting/forward-delete-at-table-cell-ending.html: Added.
+
</ins><span class="cx"> 2013-03-14  Xidorn Quan  &lt;quanxunzhen@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Clickable area is incorrect for elements with border-radius
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingbackspaceattablecellbeginningexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning-expected.txt (0 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning-expected.txt        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+This test verifies that backspace at the beginning of a table-cell is a no-op. The first dump verifies that the caret stays before 'abc', and doesn't select the nested table. The second dump verifies that the caret stays before 'def'.
+
+Dump of markup 1:
+| &lt;table&gt;
+|   &lt;tbody&gt;
+|     &lt;tr&gt;
+|       &lt;td&gt;
+|         &lt;table&gt;
+|           &lt;tbody&gt;
+|             &lt;tr&gt;
+|               &lt;td&gt;
+|                 &quot;ghi&quot;
+|               &lt;td&gt;
+|                 &quot;jkl&quot;
+|       &lt;td&gt;
+|         id=&quot;first&quot;
+|         &quot;&lt;#selection-caret&gt;abc&quot;
+|       &lt;td&gt;
+|         id=&quot;second&quot;
+|         &quot;def&quot;
+
+Dump of markup 2:
+| &lt;table&gt;
+|   &lt;tbody&gt;
+|     &lt;tr&gt;
+|       &lt;td&gt;
+|         &lt;table&gt;
+|           &lt;tbody&gt;
+|             &lt;tr&gt;
+|               &lt;td&gt;
+|                 &quot;ghi&quot;
+|               &lt;td&gt;
+|                 &quot;jkl&quot;
+|       &lt;td&gt;
+|         id=&quot;first&quot;
+|         &quot;abc&quot;
+|       &lt;td&gt;
+|         id=&quot;second&quot;
+|         &quot;&lt;#selection-caret&gt;def&quot;
</ins></span></pre></div>
<a id="trunkLayoutTestseditingdeletingbackspaceattablecellbeginninghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning.html (0 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning.html                                (rev 0)
+++ trunk/LayoutTests/editing/deleting/backspace-at-table-cell-beginning.html        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;p id=&quot;description&quot;&gt;This test verifies that backspace at the beginning of a table-cell is a no-op. The first dump verifies that the caret stays before 'abc', and doesn't select the nested table. The second dump verifies that the caret stays before 'def'.&lt;/p&gt;
+&lt;div id=&quot;test&quot; contenteditable=&quot;true&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;ghi&lt;/td&gt;&lt;td&gt;jkl&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/td&gt;&lt;td id=&quot;first&quot;&gt;abc&lt;/td&gt;&lt;td id=&quot;second&quot;&gt;def&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;script src=&quot;../../resources/dump-as-markup.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+Markup.description(document.getElementById(&quot;description&quot;).innerText);
+
+window.getSelection().collapse(document.getElementById(&quot;first&quot;).firstChild, 0);
+document.execCommand(&quot;Delete&quot;);
+Markup.dump(&quot;test&quot;);
+
+window.getSelection().collapse(document.getElementById(&quot;second&quot;).firstChild, 0);
+document.execCommand(&quot;Delete&quot;);
+Markup.dump(&quot;test&quot;);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestseditingdeletingforwarddeleteattablecellendingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending-expected.txt (0 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending-expected.txt        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+This test verifies that forward delete at the end of a table-cell is a no-op. The first dump verifies that the caret stays after 'abc'. The second dump verifies that the caret stays after 'def', and doesn't select the nested table.
+
+Dump of markup 1:
+| &lt;table&gt;
+|   border=&quot;1&quot;
+|   &lt;tbody&gt;
+|     &lt;tr&gt;
+|       &lt;td&gt;
+|         id=&quot;first&quot;
+|         &quot;abc&lt;#selection-caret&gt;&quot;
+|       &lt;td&gt;
+|         id=&quot;second&quot;
+|         &quot;def&quot;
+|       &lt;td&gt;
+|         &lt;table&gt;
+|           &lt;tbody&gt;
+|             &lt;tr&gt;
+|               &lt;td&gt;
+|                 &quot;ghi&quot;
+|               &lt;td&gt;
+|                 &quot;jkl&quot;
+
+Dump of markup 2:
+| &lt;table&gt;
+|   border=&quot;1&quot;
+|   &lt;tbody&gt;
+|     &lt;tr&gt;
+|       &lt;td&gt;
+|         id=&quot;first&quot;
+|         &quot;abc&quot;
+|       &lt;td&gt;
+|         id=&quot;second&quot;
+|         &quot;def&lt;#selection-caret&gt;&quot;
+|       &lt;td&gt;
+|         &lt;table&gt;
+|           &lt;tbody&gt;
+|             &lt;tr&gt;
+|               &lt;td&gt;
+|                 &quot;ghi&quot;
+|               &lt;td&gt;
+|                 &quot;jkl&quot;
</ins></span></pre></div>
<a id="trunkLayoutTestseditingdeletingforwarddeleteattablecellendinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending.html (0 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending.html                                (rev 0)
+++ trunk/LayoutTests/editing/deleting/forward-delete-at-table-cell-ending.html        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;p id=&quot;description&quot;&gt;This test verifies that forward delete at the end of a table-cell is a no-op. The first dump verifies that the caret stays after 'abc'. The second dump verifies that the caret stays after 'def', and doesn't select the nested table.&lt;/p&gt;
+&lt;div id=&quot;test&quot; contenteditable=&quot;true&quot;&gt;&lt;table border=&quot;1&quot;&gt;&lt;tr&gt;&lt;td id=&quot;first&quot;&gt;abc&lt;/td&gt;&lt;td id=&quot;second&quot;&gt;def&lt;/td&gt;&lt;td&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;ghi&lt;/td&gt;&lt;td&gt;jkl&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;script src=&quot;../../resources/dump-as-markup.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+Markup.description(document.getElementById(&quot;description&quot;).innerText);
+
+window.getSelection().collapse(document.getElementById(&quot;first&quot;).firstChild, 3);
+document.execCommand(&quot;ForwardDelete&quot;);
+Markup.dump(&quot;test&quot;);
+
+window.getSelection().collapse(document.getElementById(&quot;second&quot;).firstChild, 3);
+document.execCommand(&quot;ForwardDelete&quot;);
+Markup.dump(&quot;test&quot;);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (145870 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-03-15 03:37:06 UTC (rev 145870)
+++ trunk/Source/WebCore/ChangeLog        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-03-14  Shezan Baig  &lt;sbaig1@bloomberg.net&gt;
+
+        Backspace/delete at start of table cell shouldn't step out of cell
+        https://bugs.webkit.org/show_bug.cgi?id=35372
+
+        Reviewed by Ryosuke Niwa.
+
+        Make Delete and ForwardDelete commands be no-ops if we are at the first
+        position or last position of a table cell respectively.
+
+        Tests: editing/deleting/backspace-at-table-cell-beginning.html
+               editing/deleting/forward-delete-at-table-cell-ending.html
+
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::deleteKeyPressed):
+        (WebCore::TypingCommand::forwardDeleteKeyPressed):
+
</ins><span class="cx"> 2013-03-14  Xidorn Quan  &lt;quanxunzhen@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Clickable area is incorrect for elements with border-radius
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (145870 => 145871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp        2013-03-15 03:37:06 UTC (rev 145870)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp        2013-03-15 04:25:27 UTC (rev 145871)
</span><span class="lines">@@ -465,8 +465,9 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         VisiblePosition visibleStart(endingSelection().visibleStart());
</span><del>-        // If we have a caret selection on an empty cell, we have nothing to do.
-        if (isEmptyTableCell(visibleStart.deepEquivalent().containerNode()))
</del><ins>+        // If we have a caret selection at the beginning of a cell, we have nothing to do.
+        Node* enclosingTableCell = enclosingNodeOfType(visibleStart.deepEquivalent(), &amp;isTableCell);
+        if (enclosingTableCell &amp;&amp; visibleStart == firstPositionInNode(enclosingTableCell))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         // If the caret is at the start of a paragraph after a table, move content into the last table cell.
</span><span class="lines">@@ -554,7 +555,8 @@
</span><span class="cx"> 
</span><span class="cx">         Position downstreamEnd = endingSelection().end().downstream();
</span><span class="cx">         VisiblePosition visibleEnd = endingSelection().visibleEnd();
</span><del>-        if (isEmptyTableCell(visibleEnd.deepEquivalent().containerNode()))
</del><ins>+        Node* enclosingTableCell = enclosingNodeOfType(visibleEnd.deepEquivalent(), &amp;isTableCell);
+        if (enclosingTableCell &amp;&amp; visibleEnd == lastPositionInNode(enclosingTableCell))
</ins><span class="cx">             return;
</span><span class="cx">         if (visibleEnd == endOfParagraph(visibleEnd))
</span><span class="cx">             downstreamEnd = visibleEnd.next(CannotCrossEditingBoundary).deepEquivalent().downstream();
</span></span></pre>
</div>
</div>

</body>
</html>