Fix float tests to account for br changes.

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

diff --git a/LayoutTests/fast/block/float/015-expected.txt b/LayoutTests/fast/block/float/015-expected.txt
index 002ff04192bf187b684fa23e33e7d040bc38cad9..37c8c4a68374666866ce5860a3629da6f3244880 100644 (file)
--- a/LayoutTests/fast/block/float/015-expected.txt
+++ b/LayoutTests/fast/block/float/015-expected.txt
@@ -11,14 +11,14 @@ layer at (0,0) size 800x600
                 text run at (4,4) width 4: " "
             RenderTableCell {TD} at (12,0) size 657x128 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderBlock (anonymous) at (4,4) size 649x0
-                RenderImage {IMG} at (0,0) size 49x50 [bgcolor=#FFA500]
+                RenderImage {IMG} at (0,0) size 0x50 [bgcolor=#FFA500]
                 RenderText {TEXT} at (0,0) size 0x0
               RenderBlock {P} at (4,4) size 649x18
-                RenderText {TEXT} at (52,0) size 595x18
-                  text run at (52,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
+                RenderText {TEXT} at (3,0) size 595x18
+                  text run at (3,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
               RenderBlock {DIV} at (4,38) size 649x18 [bgcolor=#008000]
-                RenderBR {BR} at (52,0) size 0x18
-              RenderImage {IMG} at (4,56) size 49x50 [bgcolor=#FFA500]
+                RenderBR {BR} at (3,0) size 0x18
+              RenderImage {IMG} at (4,56) size 0x50 [bgcolor=#FFA500]
               RenderBlock {DIV} at (4,106) size 649x18
                 RenderText {TEXT} at (0,0) size 649x18
                   text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."

diff --git a/LayoutTests/fast/block/float/017-expected.txt b/LayoutTests/fast/block/float/017-expected.txt
index a74aca1bdeabaeed6d6e75be0d8ce2e19164bc69..952f2cc778d4deec6f22d0d758a3afb38ab20e41 100644 (file)
--- a/LayoutTests/fast/block/float/017-expected.txt
+++ b/LayoutTests/fast/block/float/017-expected.txt
@@ -7,7 +7,6 @@ layer at (0,0) size 800x600
         RenderImage {IMG} at (2,2) size 450x29 [bgcolor=#FFFF00]
         RenderText {TEXT} at (0,0) size 0x0
         RenderBR {BR} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
         RenderImage {IMG} at (2,31) size 250x125 [bgcolor=#FFA500]
         RenderText {TEXT} at (255,31) size 193x126
           text run at (255,31) width 186: "Theme Park Roller Coaster is"

diff --git a/LayoutTests/fast/block/float/021-expected.txt b/LayoutTests/fast/block/float/021-expected.txt
index 51fd93ab87c72472312d21b8e5e59a6a18fe2bf9..36585eecd2b139693ae8705245b58bb6dddf3804 100644 (file)
--- a/LayoutTests/fast/block/float/021-expected.txt
+++ b/LayoutTests/fast/block/float/021-expected.txt
@@ -13,7 +13,6 @@ layer at (0,0) size 1518x3166
         RenderText {TEXT} at (10,10) size 309x18
           text run at (10,10) width 309: "You should see blue and green rectangles below."
         RenderBR {BR} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
         RenderBlock (floating) {DIV} at (10,28) size 1500x100 [bgcolor=#0000FF]
         RenderText {TEXT} at (0,0) size 0x0
         RenderBlock (floating) {DIV} at (10,128) size 1500x100 [bgcolor=#008000]
@@ -50,7 +49,6 @@ layer at (0,0) size 1518x3166
         RenderText {TEXT} at (10,110) size 284x18
           text run at (10,110) width 284: "You should see blue above and green below."
         RenderBR {BR} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
         RenderBlock (floating) {DIV} at (10,128) size 1500x100 [bgcolor=#008000]
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,1588) size 784x18
@@ -60,7 +58,6 @@ layer at (0,0) size 1518x3166
         RenderText {TEXT} at (10,10) size 309x18
           text run at (10,10) width 309: "You should see blue and green rectangles below."
         RenderBR {BR} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
         RenderBlock (floating) {DIV} at (10,28) size 698x100 [bgcolor=#0000FF]
         RenderText {TEXT} at (0,0) size 0x0
         RenderBlock (floating) {DIV} at (10,128) size 698x100 [bgcolor=#008000]
@@ -96,6 +93,5 @@ layer at (0,0) size 1518x3166
         RenderText {TEXT} at (10,110) size 284x18
           text run at (10,110) width 284: "You should see blue above and green below."
         RenderBR {BR} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
         RenderBlock (floating) {DIV} at (10,128) size 698x100 [bgcolor=#008000]
         RenderText {TEXT} at (0,0) size 0x0

diff --git a/LayoutTests/fast/block/float/032-expected.txt b/LayoutTests/fast/block/float/032-expected.txt
index 64b57070ac056e6be071a47b0ba58bcb24183c3d..ba9282134e59cc37aa4630e3bf1030eb4e4fe724 100644 (file)
--- a/LayoutTests/fast/block/float/032-expected.txt
+++ b/LayoutTests/fast/block/float/032-expected.txt
@@ -10,7 +10,6 @@ layer at (0,0) size 800x1022
         RenderImage {IMG} at (205,5) size 100x100 [bgcolor=#800080]
       RenderBlock (anonymous) at (0,110) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,128) size 784x110 [border: (5px solid #000000)]
         RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]
         RenderText {TEXT} at (0,0) size 0x0
@@ -18,7 +17,6 @@ layer at (0,0) size 800x1022
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,238) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,256) size 784x110 [border: (5px solid #000000)]
         RenderBlock (anonymous) at (5,5) size 774x0
           RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
@@ -26,7 +24,6 @@ layer at (0,0) size 800x1022
         RenderImage {IMG} at (55,5) size 100x100 [bgcolor=#800080]
       RenderBlock (anonymous) at (0,366) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,384) size 784x110 [border: (5px solid #000000)]
         RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]
         RenderText {TEXT} at (0,0) size 0x0
@@ -34,7 +31,6 @@ layer at (0,0) size 800x1022
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,494) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,512) size 784x110 [border: (5px solid #000000)]
         RenderBlock (anonymous) at (5,5) size 774x0
           RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
@@ -42,7 +38,6 @@ layer at (0,0) size 800x1022
         RenderLineEdit {INPUT} at (205,5) size 100x19 [bgcolor=#800080]
       RenderBlock (anonymous) at (0,622) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,640) size 784x110 [border: (5px solid #000000)]
         RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]
         RenderText {TEXT} at (0,0) size 0x0
@@ -50,7 +45,6 @@ layer at (0,0) size 800x1022
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,750) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,768) size 784x110 [border: (5px solid #000000)]
         RenderBlock (anonymous) at (5,5) size 774x0
           RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
@@ -58,7 +52,6 @@ layer at (0,0) size 800x1022
         RenderLineEdit {INPUT} at (55,5) size 100x19 [bgcolor=#800080]
       RenderBlock (anonymous) at (0,878) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {DIV} at (0,896) size 784x110 [border: (5px solid #000000)]
         RenderBlock (floating) {DIV} at (5,5) size 100x100 [bgcolor=#008000]
         RenderText {TEXT} at (0,0) size 0x0