Changeset 145871 in webkit

Timestamp:

Mar 14, 2013 9:25:27 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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 <Shezan Baig> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/backspace-at-table-cell-beginning-expected.txt (added)
• LayoutTests/editing/deleting/backspace-at-table-cell-beginning.html (added)
• LayoutTests/editing/deleting/forward-delete-at-table-cell-ending-expected.txt (added)
• LayoutTests/editing/deleting/forward-delete-at-table-cell-ending.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/TypingCommand.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-14  Shezan Baig  <sbaig1@bloomberg.net>
+
+        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.
+
 2013-03-14  Xidorn Quan  <quanxunzhen@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-14  Shezan Baig  <sbaig1@bloomberg.net>
+
+        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):
+
 2013-03-14  Xidorn Quan  <quanxunzhen@gmail.com>
 

trunk/Source/WebCore/editing/TypingCommand.cpp

@@ -466 +466 @@
 
         VisiblePosition visibleStart(endingSelection().visibleStart());
-        // If we have a caret selection on an empty cell, we have nothing to do.
-        if (isEmptyTableCell(visibleStart.deepEquivalent().containerNode()))
+        // If we have a caret selection at the beginning of a cell, we have nothing to do.
+        Node* enclosingTableCell = enclosingNodeOfType(visibleStart.deepEquivalent(), &isTableCell);
+        if (enclosingTableCell && visibleStart == firstPositionInNode(enclosingTableCell))
             return;
 
@@ -555 +556 @@
         Position downstreamEnd = endingSelection().end().downstream();
         VisiblePosition visibleEnd = endingSelection().visibleEnd();
-        if (isEmptyTableCell(visibleEnd.deepEquivalent().containerNode()))
+        Node* enclosingTableCell = enclosingNodeOfType(visibleEnd.deepEquivalent(), &isTableCell);
+        if (enclosingTableCell && visibleEnd == lastPositionInNode(enclosingTableCell))
             return;
         if (visibleEnd == endOfParagraph(visibleEnd))