2007-01-18 Mitz Pettel <mitz@webkit.org>

Reviewed by Darin. - fix http://bugs.webkit.org/show_bug.cgi?id=11271 REGRESSION (r12358): Text in display: table unselectable Test: editing/selection/display-table-text.html * editing/htmlediting.cpp: (WebCore::isTableElement): Changed to return false for text nodes. 2007-01-18 Mitz Pettel <mitz@webkit.org> Reviewed by Darin. - test for http://bugs.webkit.org/show_bug.cgi?id=11271 REGRESSION (r12358): Text in display: table unselectable * editing/selection/display-table-text-expected.checksum: Added. * editing/selection/display-table-text-expected.png: Added. * editing/selection/display-table-text-expected.txt: Added. * editing/selection/display-table-text.html: Added. git-svn-id: svn://svn.chromium.org/blink/trunk@18968 bbb929c8-8fbe-4397-9dbb-9b2b20218538

2007-01-18 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin. - fix http://bugs.webkit.org/show_bug.cgi?id=11271 REGRESSION (r12358): Text in display: table unselectable Test: editing/selection/display-table-text.html * editing/htmlediting.cpp: (WebCore::isTableElement): Changed to return false for text nodes. 2007-01-18 Mitz Pettel <mitz@webkit.org> Reviewed by Darin. - test for http://bugs.webkit.org/show_bug.cgi?id=11271 REGRESSION (r12358): Text in display: table unselectable * editing/selection/display-table-text-expected.checksum: Added. * editing/selection/display-table-text-expected.png: Added. * editing/selection/display-table-text-expected.txt: Added. * editing/selection/display-table-text.html: Added. git-svn-id: svn://svn.chromium.org/blink/trunk@18968 bbb929c8-8fbe-4397-9dbb-9b2b20218538
7815abee · bdash · efc19ce1 · 7815abee · 7815abee · 7815abee
Commit 7815abee authored Jan 19, 2007 by bdash
6 changed files
--- a/third_party/WebKit/LayoutTests/ChangeLog
+++ b/third_party/WebKit/LayoutTests/ChangeLog
+2007-01-18  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=11271
+        REGRESSION (r12358): Text in display: table unselectable
+
+        * editing/selection/display-table-text-expected.checksum: Added.
+        * editing/selection/display-table-text-expected.png: Added.
+        * editing/selection/display-table-text-expected.txt: Added.
+        * editing/selection/display-table-text.html: Added.
+
 2007-01-18  John Sullivan  <sullivan@apple.com>

        Reviewed by Darin
--- a/third_party/WebKit/LayoutTests/editing/selection/display-table-text-expected.checksum
+++ b/third_party/WebKit/LayoutTests/editing/selection/display-table-text-expected.checksum
+4fd4b5f1f03c2bbe53f1aaf92ad19e62
\ No newline at end of file
--- a/third_party/WebKit/LayoutTests/editing/selection/display-table-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/editing/selection/display-table-text-expected.txt
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderTable {DIV} at (0,0) size 348x18
+        RenderTableSection at (0,0) size 348x18
+          RenderTableRow at (0,0) size 348x18
+            RenderTableCell at (0,0) size 348x18 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 348x18
+                text run at (0,0) width 348: "Only the third word in this sentence should be selected."
+selection start: position 9 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 14 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
--- a/third_party/WebKit/LayoutTests/editing/selection/display-table-text.html
+++ b/third_party/WebKit/LayoutTests/editing/selection/display-table-text.html
+<html> 
+<head>
+<script>
+function editingTest() {
+    if (window.layoutTestController)
+        layoutTestController.dumpEditingCallbacks();
+
+    var elem = document.getElementById("test").firstChild;
+    var selection = window.getSelection();
+
+    selection.setBaseAndExtent(elem, 9, elem, 14);
+}
+</script>
+<title>Test for http://bugs.webkit.org/show_bug.cgi?id=11271</title> 
+</head> 
+<body>
+<div id="test" style="display: table;">Only the third word in this sentence should be selected.</div>
+<script>
+editingTest();
+</script>
+</body>
+</html>
--- a/third_party/WebKit/WebCore/ChangeLog
+++ b/third_party/WebKit/WebCore/ChangeLog
+2007-01-18  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11271
+        REGRESSION (r12358): Text in display: table unselectable
+
+        Test: editing/selection/display-table-text.html
+
+        * editing/htmlediting.cpp:
+        (WebCore::isTableElement): Changed to return false for text nodes.
+
 2007-01-18  Mitz Pettel  <mitz@webkit.org>

        Reviewed by Darin.

--- a/third_party/WebKit/WebCore/editing/htmlediting.cpp
+++ b/third_party/WebKit/WebCore/editing/htmlediting.cpp
@@ -681,9 +681,12 @@ Node* highestAncestor(Node* node)
 }

 // FIXME: do not require renderer, so that this can be used within fragments, or rename to isRenderedTable()
-bool isTableElement(Node *n)
+bool isTableElement(Node* n)
 {
-    RenderObject *renderer = n ? n->renderer() : 0;
+    if (!n || !n->isElementNode())
+        return false;
+
+    RenderObject* renderer = n->renderer();
    return (renderer && (renderer->style()->display() == TABLE || renderer->style()->display() == INLINE_TABLE));
 }