Reviewed by me

        Hyatt made an improvement in the render tree which caused the results
        to get a little thinner.

        * layout-tests/editing/deleting/delete-block-merge-contents-001-expected.txt.
        * layout-tests/editing/deleting/delete-block-merge-contents-008-expected.txt.

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

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt
index de8b0e311fc89b19a40901cca74adb08940b4baa..9b1cfb640b7e883484430069ccf78497c049e66e 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-001-expected.txt
@@ -5,11 +5,10 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
         RenderBlock {DIV} at (14,14) size 756x28
-          RenderBlock (anonymous) at (0,0) 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"
+          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"
 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/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt
index 0152956cd912b2eaf061aaeb7da6ee1868ed0923..8e1abccb36d767a04aeb44e9378c77679283aedc 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-008-expected.txt
@@ -14,9 +14,8 @@ layer at (0,0) size 800x600
             RenderText {TEXT} at (0,0) size 57x28
               text run at (0,0) width 57: "Three"
           RenderBlock {DIV} at (0,56) size 756x28
-            RenderBlock (anonymous) at (0,0) size 756x28
-              RenderText {TEXT} at (0,0) size 45x28
-                text run at (0,0) width 45: "Four"
+            RenderText {TEXT} at (0,0) size 45x28
+              text run at (0,0) width 45: "Four"
 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 9d11a86d71c3f4c9006815851d4ce42da334ff41..33a3ebfa951d7397e2b5092dbb62ac097aa3128f 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-09-24  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by me
+        
+        Hyatt made an improvement in the render tree which caused the results
+        to get a little thinner.
+
+        * layout-tests/editing/deleting/delete-block-merge-contents-001-expected.txt.
+        * layout-tests/editing/deleting/delete-block-merge-contents-008-expected.txt.
+
 2004-09-24  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Hyatt