Reviewed by me

        Update expected results for improved behavior as a result of fix to 3816768.

        * layout-tests/editing/deleting/delete-3775172-fix-expected.txt
        * layout-tests/editing/deleting/delete-3800834-fix-expected.txt
        * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt

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

diff --git a/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt b/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
index ec7bc2fa9de38dc4fdbf9be8595ab794bc5884d9..6cfb5ec80c858f676198937bc2053f7ad1fd1b8b 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
@@ -3,8 +3,9 @@ layer 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
-      RenderBlock {DIV} at (0,0) size 784x0
+      RenderBlock {DIV} at (0,0) size 784x18
+        RenderBR {BR} at (0,0) size 0x18
 selection is CARET:
-start:      position 0 of  of root {DIV}
+start:      position 0 of child 1 {BR} of root {DIV}
 upstream:   position 0 of  of root {DIV}
-downstream: position 1 of  of root {DIV}
+downstream: position 0 of child 1 {BR} of root {DIV}

diff --git a/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt b/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
index 0976f8e41afe4250d2566b23f59d7c22f33ef095..8cc4f31d4baff3ccf3dffe1677cf98dbbaadb6c7 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
@@ -3,18 +3,16 @@ layer 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
-      RenderBlock {DIV} at (0,0) size 784x80 [border: (2px solid #FF0000)]
+      RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
         RenderBlock (anonymous) at (14,14) size 756x28
-          RenderInline {SPAN} at (0,0) size 25x28
-            RenderText {TEXT} at (0,0) size 25x28
-              text run at (0,0) width 25: "Fo"
-            RenderBR {BR} at (0,0) size 0x0
-        RenderBlock (anonymous) at (14,66) size 756x0
-          RenderBlock {BLOCKQUOTE} at (40,0) size 676x0
-        RenderBlock (anonymous) at (14,66) size 756x0
+          RenderInline {SPAN} at (0,0) size 37x28
+            RenderText {TEXT} at (0,0) size 37x28
+              text run at (0,0) width 37: "Foo"
+        RenderBlock (anonymous) at (14,42) size 756x0
+        RenderBlock (anonymous) at (14,42) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
 selection is CARET:
-start:      position 2 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 2 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-downstream: position 0 of child 2 {BR} of child 2 {SPAN} of root {DIV}
+start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+downstream: position 1 of child 3 {TEXT} of root {DIV}

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
index 83e52017ca0e7391e3bbd6be22ac9922ce58744b..c84eb0edaa2381dbe1f547ff83fae100b7a197fd 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-002-expected.txt
@@ -3,15 +3,14 @@ layer 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
-      RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #FF0000)]
-        RenderBlock {DIV} at (14,14) size 756x56
+      RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
+        RenderBlock {DIV} at (14,14) size 756x28
           RenderText {TEXT} at (0,0) size 40x28
             text run at (0,0) width 40: "One"
           RenderText {TEXT} at (40,0) size 44x28
             text run at (40,0) width 44: "Two"
-          RenderBR {BR} at (0,0) size 0x0
-          RenderText {TEXT} at (0,28) size 57x28
-            text run at (0,28) width 57: "Three"
+          RenderText {TEXT} at (84,0) size 63x28
+            text run at (84,0) width 63: " Three"
 selection is CARET:
 start:      position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}
 upstream:   position 3 of child 1 {TEXT} of child 2 {DIV} of root {DIV}

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e9ec18944a7dfdc3ef64df4116c2cd8c8c62fd9f..2537ff3ab8b5c4e228e8edbfafdb373704e44df7 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-10-13  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by me
+
+        Update expected results for improved behavior as a result of fix to 3816768.
+    
+        * layout-tests/editing/deleting/delete-3775172-fix-expected.txt
+        * layout-tests/editing/deleting/delete-3800834-fix-expected.txt
+        * layout-tests/editing/deleting/delete-block-merge-contents-002-expected.txt
+
 2004-10-13  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Richard