Changeset 52126 in webkit

Timestamp:

Dec 14, 2009 5:14:35 PM (14 years ago)

Author:

enrica@apple.com

Message:

Pressing backspace inside a table cell erases all empty rows below it.
<rdar://problem/5565461>
​https://bugs.webkit.org/show_bug.cgi?id=32526

Reviewed by John Sullivan.

WebCore:

No deletion is performed when the caret selection is on an empty table cell.

Test: editing/deleting/delete-empty-table.html

• editing/TypingCommand.cpp:

(WebCore::TypingCommand::deleteKeyPressed): Added check for empty table cells in
case of caret selection.

LayoutTests:

• editing/deleting/delete-empty-table-expected.txt: Added.
• editing/deleting/delete-empty-table.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/delete-empty-table-expected.txt (added)
• LayoutTests/editing/deleting/delete-empty-table.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TypingCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-14  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Pressing backspace inside a table cell erases all empty rows below it.
+        <rdar://problem/5565461>
+        https://bugs.webkit.org/show_bug.cgi?id=32526
+
+        * editing/deleting/delete-empty-table-expected.txt: Added.
+        * editing/deleting/delete-empty-table.html: Added.
+
 2009-12-14  Brian Weinstein  <bweinstein@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-14  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Pressing backspace inside a table cell erases all empty rows below it.
+        <rdar://problem/5565461>
+        https://bugs.webkit.org/show_bug.cgi?id=32526
+
+        No deletion is performed when the caret selection is on an empty table cell.
+        
+        Test: editing/deleting/delete-empty-table.html
+
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::deleteKeyPressed): Added check for empty table cells in
+        case of caret selection.
+
 2009-12-14  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/editing/TypingCommand.cpp

@@ -451 +451 @@
             
             VisiblePosition visibleStart(endingSelection().visibleStart());
+            Node *startNode = visibleStart.deepEquivalent().node();
+            // If we have a caret selection on an empty cell, we have nothing to do.
+            if (startNode && startNode->renderer() && (startNode->renderer()->isTableCell() || (startNode->renderer()->isBR() && startNode->parentNode()->renderer() && startNode->parentNode()->renderer()->isTableCell())))
+                return;
+
             // If the caret is at the start of a paragraph after a table, move content into the last table cell.
             if (isStartOfParagraph(visibleStart) && isFirstPositionAfterTable(visibleStart.previous(true))) {