LayoutTests:

        Reviewed by Hyatt.

        - fix layout test editing/style/table-selection.html

        * editing/style/table-selection-expected.txt: Updated selection delegate output.

WebCore:

        Reviewed by Hyatt.

        - fix layout test editing/style/table-selection.html

        This was broken by the change to keep whitespace text nodes in tables. They safely didn't render,
        but the font delta style change command would wrap them in spans, creating extra anonymous table
        cells.

        * editing/ApplyStyleCommand.cpp:
        (WebCore::ApplyStyleCommand::applyRelativeFontStyleChange): Don't wrap in a span if the text node
        is not rendered.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0b9c851de22ca9d685c9614b4328f1a1ad05b821..883b6e88b5b5f668797e5dc4a6645c2ad6bcdd76 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+<<<<<<< .mine
+2007-05-30  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Hyatt.
+        
+        - fix layout test editing/style/table-selection.html
+
+        * editing/style/table-selection-expected.txt: Updated selection delegate output.
+
+=======
 2007-05-30  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Oliver.
@@ -62,6 +72,7 @@
         * fast/dom/Window/window-properties-expected.txt: adds new constructors
         * fast/dom/wrapper-classes-expected.txt: CSSStyleRule now passes!!
 
+>>>>>>> .r21912
 2007-05-30  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Mitz.

diff --git a/LayoutTests/editing/style/table-selection-expected.txt b/LayoutTests/editing/style/table-selection-expected.txt
index 5e0c3db59336c260b057881b4294db3521ad68d4..0f42e490587dd6113e8761c618ebf9f3fb7e7b9e 100644 (file)
--- a/LayoutTests/editing/style/table-selection-expected.txt
+++ b/LayoutTests/editing/style/table-selection-expected.txt
@@ -24,5 +24,5 @@ layer at (0,0) size 800x600
               RenderTableCell {TD} at (2,26) size 26x22 [r=1 c=0 rs=1 cs=1]
                 RenderText {#text} at (1,1) size 23x20
                   text run at (1,1) width 23: "bar"
-selection start: position 1 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 4 of child 0 {#text} of child 0 {TD} of child 1 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection start: position 1 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 4 of child 0 {#text} of child 1 {TD} of child 2 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5d1949186ef2965e0124105778a9af9868b91ec9..c2f3a9a122582cbaa01939b16ce9ba9a9af010e8 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2007-05-30  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Hyatt.
+
+        - fix layout test editing/style/table-selection.html
+        
+        This was broken by the change to keep whitespace text nodes in tables. They safely didn't render,
+        but the font delta style change command would wrap them in spans, creating extra anonymous table
+        cells.
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::applyRelativeFontStyleChange): Don't wrap in a span if the text node
+        is not rendered.
+
 2007-05-31  Alp Toker  <alp.toker@collabora.co.uk>
 
         Reviewed by Eric Seidel.

diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index dac31b0c3ab0844bb59b8a770d84d242e34c3de8..83cbd04561fd457128c75d10a063373a9bd33462 100644 (file)
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -507,7 +507,7 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(CSSMutableStyleDeclaration
             if (!nodeFullySelected(node, start, end))
                 continue;
             elem = static_cast<HTMLElement *>(node);
-        } else if (node->isTextNode() && node->parentNode() != lastStyledNode) {
+        } else if (node->isTextNode() && node->renderer() && node->parentNode() != lastStyledNode) {
             // Last styled node was not parent node of this text node, but we wish to style this
             // text node. To make this possible, add a style span to surround this text node.
             RefPtr<HTMLElement> span = createStyleSpanElement(document());