Land changes to editing test from <br> patch.

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

diff --git a/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt b/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
index 10c542186fc917593f3aa7ae75de9b7d2cc81e8e..4fc3e6a92fd28726855af659bec7136675ad7443 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
@@ -8,7 +8,6 @@ layer at (0,0) size 800x600
           RenderText {TEXT} at (14,14) size 15x28
             text run at (14,14) width 15: "s "
           RenderBR {BR} at (0,0) size 0x0
-          RenderText {TEXT} at (0,0) size 0x0
           RenderBR {BR} at (14,42) size 0x28
           RenderText {TEXT} at (14,70) size 205x28
             text run at (14,70) width 94: " war. We "

diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt
index d79725c1ea1a77b198fb4ac26fb835d7c5d94b9e..83e52017ca0e7391e3bbd6be22ac9922ce58744b 100644 (file)
--- a/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-block-merge-contents-004-expected.txt
@@ -10,7 +10,6 @@ layer at (0,0) size 800x600
           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,0) size 0x0
           RenderText {TEXT} at (0,28) size 57x28
             text run at (0,28) width 57: "Three"
 selection is CARET:

diff --git a/LayoutTests/editing/deleting/delete-br-003-expected.txt b/LayoutTests/editing/deleting/delete-br-003-expected.txt
index f52a62f8aab21774e8748ccef78bcbedf5976126..210a1b7c35c2dcdc38f6150be8a569a82344bf5c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-br-003-expected.txt
+++ b/LayoutTests/editing/deleting/delete-br-003-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x600
             text run at (14,14) width 102: "Fourscore "
             text run at (116,14) width 41: "and "
             text run at (157,14) width 61: "seven "
-          RenderBR {BR} at (14,42) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
           RenderBR {BR} at (14,42) size 0x28
           RenderText {TEXT} at (14,70) size 92x28
             text run at (14,70) width 92: "years ago"

diff --git a/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt b/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt
index e9bfc510400e76b9d6f4a326fc540693dc0c3755..642139399f4030ca4c8db816f01b49dc726b5a37 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3654864-fix-expected.txt
@@ -6,9 +6,7 @@ layer at (0,0) size 800x600
       RenderBR {BR} at (14,14) size 0x28
       RenderText {TEXT} at (14,42) size 36x28
         text run at (14,42) width 36: "xxx"
-      RenderBR {BR} at (14,42) size 0x28
-      RenderText {TEXT} at (0,0) size 0x0
-      RenderText {TEXT} at (0,0) size 0x0
+      RenderBR {BR} at (0,0) size 0x0
 selection is CARET:
 start:      position 3 of child 2 {TEXT} of root {BODY}
 upstream:   position 3 of child 2 {TEXT} of root {BODY}

diff --git a/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt b/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt
index 20642010423e66c4e265e880621666b4122de882..062df42a1adb0de558dbcd8bee44fa8712d68632 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3659587-fix-expected.txt
@@ -11,7 +11,7 @@ layer at (0,0) size 800x600
             RenderBR {BR} at (0,0) size 0x0
             RenderText {TEXT} at (14,42) size 36x28
               text run at (14,42) width 36: "xxx"
-            RenderBR {BR} at (14,42) size 0x28
+            RenderBR {BR} at (0,0) size 0x0
 selection is CARET:
 start:      position 3 of child 3 {TEXT} of child 1 {B} of child 1 {SPAN} of root {DIV}
 upstream:   position 3 of child 3 {TEXT} of child 1 {B} of child 1 {SPAN} of root {DIV}

diff --git a/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt b/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt
index 8613b0f9c611a7bf620a7f5d331025cc3aebdf22..6631dda68c846574817c96ad937dc2e3417f1c97 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3775316-fix-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,42) size 12x28
             text run at (14,42) width 12: "x"
-          RenderBR {BR} at (14,42) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
 selection is CARET:
 start:      position 1 of child 3 {TEXT} of child 1 {SPAN} of root {DIV}
 upstream:   position 1 of child 3 {TEXT} of child 1 {SPAN} of root {DIV}

diff --git a/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt b/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt
index 71ef978011f3473037f01719e9d48d0a76c75612..13c63488320cd053d903ba3850c56a3cf9c534b5 100644 (file)
--- a/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt
+++ b/LayoutTests/editing/inserting/insert-3778059-fix-expected.txt
@@ -11,8 +11,7 @@ layer at (0,0) size 800x600
           RenderBlock (anonymous) at (0,52) size 756x28
             RenderText {TEXT} at (0,0) size 12x28
               text run at (0,0) width 12: "x"
-            RenderBR {BR} at (0,0) size 0x28
-            RenderText {TEXT} at (0,0) size 0x0
+            RenderBR {BR} at (0,0) size 0x0
           RenderBlock {BLOCKQUOTE} at (40,104) size 676x28
             RenderText {TEXT} at (0,0) size 42x28
               text run at (0,0) width 42: "Test"

diff --git a/LayoutTests/editing/inserting/insert-br-001-expected.txt b/LayoutTests/editing/inserting/insert-br-001-expected.txt
index 495a8bb1008324fba1836965619ebf5499575381..5ae04d2032e1e51df730f1ce20285adb71ffc777 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-001-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-001-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,42) size 12x28
             text run at (14,42) width 12: "x"
-          RenderBR {BR} at (14,42) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
 selection is CARET:
 start:      position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}
 upstream:   position 1 of child 3 {TEXT} of child 2 {SPAN} of root {DIV}

diff --git a/LayoutTests/editing/inserting/insert-br-002-expected.txt b/LayoutTests/editing/inserting/insert-br-002-expected.txt
index 5bcbae403950dc42d54a0553f59fe17080062fca..db07bc6055b3c4cc7ec4bb45b088f71861b7d55a 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-002-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-002-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,42) size 12x28
             text run at (14,42) width 12: "x"
-          RenderBR {BR} at (14,42) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,70) size 34x28
             text run at (14,70) width 34: "test"
         RenderText {TEXT} at (0,0) size 0x0

diff --git a/LayoutTests/editing/inserting/insert-br-005-expected.txt b/LayoutTests/editing/inserting/insert-br-005-expected.txt
index b974b77559f338aab403e99432356fa7fd7b20e7..9c45694e28e0cdf97c8450d6974f6e89cfb7da39 100644 (file)
--- a/LayoutTests/editing/inserting/insert-br-005-expected.txt
+++ b/LayoutTests/editing/inserting/insert-br-005-expected.txt
@@ -11,7 +11,7 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (14,42) size 0x28
           RenderText {TEXT} at (14,70) size 12x28
             text run at (14,70) width 12: "x"
-          RenderBR {BR} at (14,70) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
 selection is CARET:
 start:      position 1 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}
 upstream:   position 1 of child 4 {TEXT} of child 2 {SPAN} of root {DIV}

diff --git a/LayoutTests/editing/inserting/typing-around-br-001-expected.txt b/LayoutTests/editing/inserting/typing-around-br-001-expected.txt
index 85a9f6563ae5d07c4d026d757ac4cbe1b47025dd..10a2a688cb5a7c863be09744d9937ddc5ad6fa59 100644 (file)
--- a/LayoutTests/editing/inserting/typing-around-br-001-expected.txt
+++ b/LayoutTests/editing/inserting/typing-around-br-001-expected.txt
@@ -13,19 +13,19 @@ layer at (0,0) size 800x600
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,70) size 36x28
             text run at (14,70) width 36: "xxx"
-          RenderBR {BR} at (14,70) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,98) size 70x28
             text run at (14,98) width 70: "XXxxx"
           RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,126) size 36x28
             text run at (14,126) width 36: "xxx"
-          RenderBR {BR} at (14,126) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,154) size 36x28
             text run at (14,154) width 36: "xxx"
-          RenderBR {BR} at (14,154) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,182) size 36x28
             text run at (14,182) width 36: "xxx"
-          RenderBR {BR} at (14,182) size 0x28
+          RenderBR {BR} at (0,0) size 0x0
           RenderText {TEXT} at (14,210) size 70x28
             text run at (14,210) width 70: "XXxxx"
 selection is CARET:

diff --git a/LayoutTests/editing/selection/select-all-003-expected.txt b/LayoutTests/editing/selection/select-all-003-expected.txt
index 65d074a9d5c2daa97c3bdd45fc594bb3bc9e0211..ba9e58aa6a21f9f33276a9ab4969a5954683ad6c 100644 (file)
--- a/LayoutTests/editing/selection/select-all-003-expected.txt
+++ b/LayoutTests/editing/selection/select-all-003-expected.txt
@@ -4,9 +4,8 @@ layer at (0,0) size 812x1044
   RenderBlock {HTML} at (0,0) size 800x1044
     RenderBody {BODY} at (64,64) size 748x916 [border: (50px solid #FF0000)]
       RenderBlock (anonymous) at (74,74) size 600x768
-        RenderBR {BR} at (0,10) size 0x28
-        RenderText {TEXT} at (0,0) size 0x0
-        RenderBR {BR} at (0,58) size 0x28
+        RenderBR {BR} at (0,10) size 0x48
+        RenderBR {BR} at (0,58) size 0x48
         RenderText {TEXT} at (0,106) size 598x624
           text run at (0,106) width 552: "Four score and seven years ago our fathers brought forth,"
           text run at (0,154) width 583: "upon this continent, a new nation, conceived in Liberty, and"
@@ -22,9 +21,7 @@ layer at (0,0) size 812x1044
           text run at (0,634) width 554: "Liberty, and dedicated to the proposition that all men are"
           text run at (0,682) width 142: "created equal. "
         RenderBR {BR} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
-        RenderBR {BR} at (0,730) size 0x28
-        RenderText {TEXT} at (0,0) size 0x0
+        RenderBR {BR} at (0,730) size 0x48
       RenderBlock {DIV} at (74,842) size 600x0
 selection is RANGE:
 start:      position 0 of child 1 {BR} of root {BODY}

diff --git a/LayoutTests/editing/selection/select-all-004-expected.txt b/LayoutTests/editing/selection/select-all-004-expected.txt
index 5fcffc52918f14441bdb7e11fa7471c3b5b4afbd..35fce3b3e3364f7ef1a0658d28a4b04606a2da06 100644 (file)
--- a/LayoutTests/editing/selection/select-all-004-expected.txt
+++ b/LayoutTests/editing/selection/select-all-004-expected.txt
@@ -12,10 +12,7 @@ layer at (0,0) size 812x585
           RenderTableRow {TR} at (0,0) size 0x0
             RenderTableCell {TD} at (2,2) size 2x2 [r=0 c=0 rs=1 cs=1]
       RenderBlock (anonymous) at (74,128) size 600x48
-        RenderBR {BR} at (0,10) size 0x28
-        RenderText {TEXT} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
+        RenderBR {BR} at (0,10) size 0x48
 selection is RANGE:
 start:      position 1 of child 2 {TEXT} of root {BODY}
 upstream:   position 0 of child 2 {TEXT} of root {BODY}

diff --git a/LayoutTests/editing/selection/selection-3748164-fix-expected.txt b/LayoutTests/editing/selection/selection-3748164-fix-expected.txt
index a9ac720450925ca47dea067dc1e8dd35ffcfb0af..284d8ff7444ca1ab6f9c2b6f3c2117a9f71f2385 100644 (file)
--- a/LayoutTests/editing/selection/selection-3748164-fix-expected.txt
+++ b/LayoutTests/editing/selection/selection-3748164-fix-expected.txt
@@ -7,12 +7,10 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (14,14) size 756x43
           RenderInline {SPAN} at (0,0) size 0x0
           RenderBR {BR} at (0,0) size 0x28
-          RenderText {TEXT} at (0,0) size 0x0
           RenderInline {SPAN} at (0,0) size 33x15
             RenderText {TEXT} at (0,28) size 33x15
               text run at (0,28) width 33: "- Ken"
           RenderBR {BR} at (0,0) size 0x0
-          RenderText {TEXT} at (0,0) size 0x0
           RenderInline {SPAN} at (0,0) size 0x0
           RenderText {TEXT} at (0,0) size 0x0
 selection is CARET: