Reviewed by NOBODY (OOPS!).

        * khtml/editing/htmlediting_impl.cpp:
        (khtml::InputNewlineCommandImpl::doApply):
        * layout-tests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt:
        * layout-tests/editing/selection/move-by-line-001-expected.txt:

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

diff --git a/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt b/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt
index e1ddccdde8b2cea5f2e5f96b651e784ec2452744..214cc89c15b6abaaca85b75d776d07a6f9660e48 100644 (file)
--- a/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt
+++ b/LayoutTests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt
@@ -4,14 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-        RenderInline {SPAN} at (0,0) size 74x28
-          RenderText {TEXT} at (14,14) size 40x28
-            text run at (14,14) width 40: "test "
-          RenderInline {MAP} at (0,0) size 0x0
-          RenderText {TEXT} at (54,14) size 34x28
-            text run at (54,14) width 34: "test"
-        RenderText {TEXT} at (0,0) size 0x0
 selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+start:      position 0 of  of root {DIV}
 upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+downstream: position 1 of  of root {DIV}

diff --git a/LayoutTests/editing/selection/move-by-line-001-expected.txt b/LayoutTests/editing/selection/move-by-line-001-expected.txt
index 334d9176c2df20b5fb19f25bf06dcfafa50f77c9..89b6f04da6e4e8e62fe64ac8eb6837dc178e2f7a 100644 (file)
--- a/LayoutTests/editing/selection/move-by-line-001-expected.txt
+++ b/LayoutTests/editing/selection/move-by-line-001-expected.txt
@@ -18,6 +18,6 @@ layer at (0,0) size 800x600
                   RenderText {TEXT} at (13,13) size 31x28
                     text run at (13,13) width 31: "bar"
 selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 1 {TD} of child 1 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
-upstream:   position 0 of child 1 {TD} of child 1 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {TD} of child 1 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
+start:      position 3 of child 1 {TEXT} of child 1 {TD} of child 3 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
+upstream:   position 3 of child 1 {TEXT} of child 1 {TD} of child 3 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}
+downstream: position 3 of child 1 {TEXT} of child 1 {TD} of child 3 {TR} of child 2 {TBODY} of child 1 {TABLE} of child 2 {DIV} of root {DIV}

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 203d44a3e6f6ff3a91fef5fad3df2c9df2bffc19..008110a229fe675da7cd5a126719d23f082adc4f 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-08-31  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/editing/htmlediting_impl.cpp:
+        (khtml::InputNewlineCommandImpl::doApply):
+        * layout-tests/editing/deleting/collapse-whitespace-3587601-fix-expected.txt:
+        * layout-tests/editing/selection/move-by-line-001-expected.txt:
+
 2004-08-31  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by me