Changeset 60936 in webkit

Timestamp:

Jun 9, 2010 10:22:41 PM (14 years ago)

Author:

rolandsteiner@chromium.org

Message:

Bug 35632 - htmlediting.cpp : isEmptyTableCell() is incomplete
​https://bugs.webkit.org/show_bug.cgi?id=35632

Reviewed by Ojan Vafai.

WebCore:

Correct isEmptyTableCell to check for the presence of other renderer
children.

Test: editing/deleting/delete-br-in-last-table-cell.html

• editing/htmlediting.cpp:

(WebCore::isEmptyTableCell):

LayoutTests:

Correct isEmptyTableCell to check for the presence of other renderer
children.

Layout test checks that deleting a <br> within the last table cell works.

• editing/deleting/delete-br-in-last-table-cell-expected.txt: Added.
• editing/deleting/delete-br-in-last-table-cell.html: Added.
• platform/gtk/Skipped:
• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/delete-br-in-last-table-cell-expected.txt (added)
• LayoutTests/editing/deleting/delete-br-in-last-table-cell.html (added)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/htmlediting.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-09  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Bug 35632 -  htmlediting.cpp : isEmptyTableCell() is incomplete
+        https://bugs.webkit.org/show_bug.cgi?id=35632
+
+        Correct isEmptyTableCell to check for the presence of other renderer
+        children.
+        
+        Layout test checks that deleting a <br> within the last table cell works.
+
+        * editing/deleting/delete-br-in-last-table-cell-expected.txt: Added.
+        * editing/deleting/delete-br-in-last-table-cell.html: Added.
+        * platform/gtk/Skipped:
+        * platform/qt/Skipped:
+
 2010-06-09  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -745 +745 @@
 editing/deleting/delete-br-011.html
 editing/deleting/delete-br-012.html
+editing/deleting/delete-br-in-last-table-cell.html
 editing/deleting/delete-by-word-002.html
 editing/deleting/delete-character-001.html

trunk/LayoutTests/platform/qt/Skipped

@@ -2080 +2080 @@
 editing/deleting/delete-br-012.html
 editing/deleting/delete-br-013.html
+editing/deleting/delete-br-in-last-table-cell.html
 editing/deleting/delete-character-001.html
 editing/deleting/delete-first-list-item.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-09  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Bug 35632 -  htmlediting.cpp : isEmptyTableCell() is incomplete
+        https://bugs.webkit.org/show_bug.cgi?id=35632
+
+        Correct isEmptyTableCell to check for the presence of other renderer
+        children.
+
+        Test: editing/deleting/delete-br-in-last-table-cell.html
+
+        * editing/htmlediting.cpp:
+        (WebCore::isEmptyTableCell):
+
 2010-06-09  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/WebCore/editing/htmlediting.cpp

@@ -870 +870 @@
 bool isEmptyTableCell(const Node* node)
 {
-    return node && node->renderer() && (node->renderer()->isTableCell() || (node->renderer()->isBR() && node->parentNode()->renderer() && node->parentNode()->renderer()->isTableCell()));     
+    // Returns true IFF the passed in node is one of:
+    //   .) a table cell with no children,
+    //   .) a table cell with a single BR child, and which has no other child renderers, including :before and :after renderers
+    //   .) the BR child of such a table cell
+
+    // Find rendered node
+    while (node && !node->renderer())
+        node = node->parent();
+    if (!node)
+        return false;
+
+    // Make sure the rendered node is a table cell or <br>.
+    // If it's a <br>, then the parent node has to be a table cell.
+    RenderObject* renderer = node->renderer();
+    if (renderer->isBR()) {
+        renderer = renderer->parent();
+        if (!renderer)
+            return false;
+    }
+    if (!renderer->isTableCell())
+        return false;
+
+    // Check that the table cell contains no child renderers except for perhaps a single <br>.
+    RenderObject* childRenderer = renderer->firstChild();
+    if (!childRenderer)
+        return true;
+    if (!childRenderer->isBR())
+        return false;
+    return !childRenderer->nextSibling();
 }