Index: webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt |
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt |
index b06d8393a708b876a20588b6011f2ff49dd9ea2a..0c17daaa076ee3a830ff1ce4081bc66f4fade0ee 100644 |
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt |
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt |
@@ -1,8 +1,8 @@ |
-layer at (0,0) size 785x2444 |
+layer at (0,0) size 785x2436 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x2444 |
- RenderBlock {HTML} at (0,0) size 785x2444 |
- RenderBody {BODY} at (8,8) size 769x2428 |
+layer at (0,0) size 785x2436 |
+ RenderBlock {HTML} at (0,0) size 785x2436 |
+ RenderBody {BODY} at (8,8) size 769x2420 |
RenderBlock (anonymous) at (0,0) size 769x40 |
RenderText {#text} at (0,0) size 754x39 |
text run at (0,0) width 517: "Test of objects that avoid floats to see what they do with percentage and auto widths. " |
@@ -12,7 +12,7 @@ layer at (0,0) size 785x2444 |
RenderBlock (anonymous) at (0,58) size 769x20 |
RenderText {#text} at (0,0) size 477x19 |
text run at (0,0) width 477: "The inline-level button should be below the select and fill the width of the block." |
- RenderBlock {P} at (0,94) size 220x88 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,94) size 220x86 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -21,15 +21,15 @@ layer at (0,0) size 785x2444 |
RenderText at (4,1) size 24x16 |
text run at (4,1) width 24: "One" |
RenderText {#text} at (0,0) size 0x0 |
- RenderButton {INPUT} at (10,54) size 200x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
- RenderBlock (anonymous) at (8,2) size 184x18 |
- RenderText at (86,1) size 12x16 |
- text run at (86,1) width 12: "Hi" |
+ RenderButton {INPUT} at (10,54) size 200x20 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
+ RenderBlock (anonymous) at (8,2) size 184x16 |
+ RenderText at (86,0) size 12x16 |
+ text run at (86,0) width 12: "Hi" |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock (anonymous) at (0,198) size 769x20 |
+ RenderBlock (anonymous) at (0,196) size 769x20 |
RenderText {#text} at (0,0) size 446x19 |
text run at (0,0) width 446: "The floating button with a percentage width should be even with the select." |
- RenderBlock {P} at (0,234) size 220x66 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,232) size 220x64 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -38,16 +38,16 @@ layer at (0,0) size 785x2444 |
RenderText at (4,1) size 24x16 |
text run at (4,1) width 24: "One" |
RenderText {#text} at (0,0) size 0x0 |
- RenderButton {INPUT} at (110,32) size 100x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
- RenderBlock (anonymous) at (8,2) size 84x18 |
- RenderText at (36,1) size 12x16 |
- text run at (36,1) width 12: "Hi" |
+ RenderButton {INPUT} at (110,32) size 100x20 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
+ RenderBlock (anonymous) at (8,2) size 84x16 |
+ RenderText at (36,0) size 12x16 |
+ text run at (36,0) width 12: "Hi" |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (210,30) size 0x19 |
- RenderBlock (anonymous) at (0,316) size 769x20 |
+ RenderBlock (anonymous) at (0,312) size 769x20 |
RenderText {#text} at (0,0) size 437x19 |
text run at (0,0) width 437: "The block-level button with an auto width should be even with the select." |
- RenderBlock {P} at (0,352) size 220x86 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,348) size 220x84 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -57,16 +57,16 @@ layer at (0,0) size 785x2444 |
RenderText at (4,1) size 24x16 |
text run at (4,1) width 24: "One" |
RenderText {#text} at (0,0) size 0x0 |
- RenderButton {INPUT} at (110,32) size 34x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
- RenderBlock (anonymous) at (8,2) size 18x18 |
- RenderText at (3,1) size 12x16 |
- text run at (3,1) width 12: "Hi" |
- RenderBlock (anonymous) at (10,56) size 200x20 |
+ RenderButton {INPUT} at (110,32) size 28x20 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
+ RenderBlock (anonymous) at (8,2) size 12x16 |
+ RenderText at (0,0) size 12x16 |
+ text run at (0,0) width 12: "Hi" |
+ RenderBlock (anonymous) at (10,54) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,454) size 769x20 |
+ RenderBlock (anonymous) at (0,448) size 769x20 |
RenderText {#text} at (0,0) size 470x19 |
text run at (0,0) width 470: "The block-level button with a percentage width should be even with the select." |
- RenderBlock {P} at (0,490) size 220x86 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,484) size 220x84 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -76,16 +76,16 @@ layer at (0,0) size 785x2444 |
RenderText at (4,1) size 24x16 |
text run at (4,1) width 24: "One" |
RenderText {#text} at (0,0) size 0x0 |
- RenderButton {INPUT} at (110,32) size 100x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
- RenderBlock (anonymous) at (8,2) size 84x18 |
- RenderText at (36,1) size 12x16 |
- text run at (36,1) width 12: "Hi" |
- RenderBlock (anonymous) at (10,56) size 200x20 |
+ RenderButton {INPUT} at (110,32) size 100x20 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)] |
+ RenderBlock (anonymous) at (8,2) size 84x16 |
+ RenderText at (36,0) size 12x16 |
+ text run at (36,0) width 12: "Hi" |
+ RenderBlock (anonymous) at (10,54) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,592) size 769x20 |
+ RenderBlock (anonymous) at (0,584) size 769x20 |
RenderText {#text} at (0,0) size 437x19 |
text run at (0,0) width 437: "The floating table with a percentage width should be even with the select." |
- RenderBlock {P} at (0,628) size 220x72 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,620) size 220x72 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -102,11 +102,11 @@ layer at (0,0) size 785x2444 |
text run at (2,2) width 34: "Table" |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (210,30) size 0x19 |
- RenderBlock (anonymous) at (0,716) size 769x40 |
+ RenderBlock (anonymous) at (0,708) size 769x40 |
RenderText {#text} at (0,0) size 711x39 |
text run at (0,0) width 711: "The floating table with an auto width should be even with the select and shrinks to use the available line width. THIS IS" |
text run at (0,20) width 154: "CURRENTLY BUGGY." |
- RenderBlock {P} at (0,772) size 220x134 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,764) size 220x134 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -125,11 +125,11 @@ layer at (0,0) size 785x2444 |
text run at (2,42) width 85: "previous float." |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (110,30) size 0x19 |
- RenderBlock (anonymous) at (0,922) size 769x20 |
+ RenderBlock (anonymous) at (0,914) size 769x20 |
RenderText {#text} at (0,0) size 695x19 |
text run at (0,0) width 550: "The block-level table below has a percentage width and should still be even with the select. " |
text run at (550,0) width 145: "It spills out of the block." |
- RenderBlock {P} at (0,958) size 220x154 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,950) size 220x154 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -149,11 +149,11 @@ layer at (0,0) size 785x2444 |
text run at (2,42) width 85: "previous float." |
RenderBlock (anonymous) at (10,124) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,1128) size 769x20 |
+ RenderBlock (anonymous) at (0,1120) size 769x20 |
RenderText {#text} at (0,0) size 705x19 |
text run at (0,0) width 517: "The block-level table below has an auto width and should still be even with the select. " |
text run at (517,0) width 188: "It shrinks to fit inside the block." |
- RenderBlock {P} at (0,1164) size 220x172 [border: (10px solid #FF0000)] |
+ RenderBlock {P} at (0,1156) size 220x172 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -175,10 +175,10 @@ layer at (0,0) size 785x2444 |
text run at (2,82) width 85: "previous float." |
RenderBlock (anonymous) at (10,142) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,1352) size 769x20 |
+ RenderBlock (anonymous) at (0,1344) size 769x20 |
RenderText {#text} at (0,0) size 507x19 |
text run at (0,0) width 507: "The floating overflow section with a percentage width should be even with the select." |
- RenderBlock {DIV} at (0,1372) size 220x140 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,1364) size 220x140 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -189,11 +189,11 @@ layer at (0,0) size 785x2444 |
RenderText {#text} at (0,0) size 0x0 |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (210,30) size 0x19 |
- RenderBlock (anonymous) at (0,1512) size 769x40 |
+ RenderBlock (anonymous) at (0,1504) size 769x40 |
RenderText {#text} at (0,0) size 763x39 |
text run at (0,0) width 763: "The floating overflow section with an auto width should be even with the select and shrinks to use the available line width. THIS" |
text run at (0,20) width 172: "IS CURRENTLY BUGGY." |
- RenderBlock {DIV} at (0,1552) size 220x122 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,1544) size 220x122 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -204,10 +204,10 @@ layer at (0,0) size 785x2444 |
RenderText {#text} at (0,0) size 0x0 |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (110,30) size 0x19 |
- RenderBlock (anonymous) at (0,1674) size 769x20 |
+ RenderBlock (anonymous) at (0,1666) size 769x20 |
RenderText {#text} at (0,0) size 616x19 |
text run at (0,0) width 616: "The block-level overflow section below has a percentage width and should still be even with the select." |
- RenderBlock {DIV} at (0,1694) size 220x160 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,1686) size 220x160 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -219,12 +219,12 @@ layer at (0,0) size 785x2444 |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (anonymous) at (10,130) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,1854) size 769x40 |
+ RenderBlock (anonymous) at (0,1846) size 769x40 |
RenderText {#text} at (0,0) size 733x39 |
text run at (0,0) width 587: "The block-level overflow section below has an auto width and should still be even with the select. " |
text run at (587,0) width 146: "It shrinks to fit inside the" |
text run at (0,20) width 38: "block." |
- RenderBlock {DIV} at (0,1894) size 220x160 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,1886) size 220x160 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -236,10 +236,10 @@ layer at (0,0) size 785x2444 |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock (anonymous) at (10,130) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,2054) size 769x20 |
+ RenderBlock (anonymous) at (0,2046) size 769x20 |
RenderText {#text} at (0,0) size 420x19 |
text run at (0,0) width 420: "The floating hr with a percentage width should be even with the select." |
- RenderBlock {DIV} at (0,2074) size 220x62 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,2066) size 220x62 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -251,10 +251,10 @@ layer at (0,0) size 785x2444 |
RenderBlock (floating) {HR} at (112,32) size 82x2 [border: (1px inset #000000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (196,30) size 0x19 |
- RenderBlock (anonymous) at (0,2136) size 769x20 |
+ RenderBlock (anonymous) at (0,2128) size 769x20 |
RenderText {#text} at (0,0) size 735x19 |
text run at (0,0) width 735: "The floating hr below should still be even with the select and shrinks to use its intrinsic width (which is basically like 1-2px)." |
- RenderBlock {DIV} at (0,2156) size 220x62 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,2148) size 220x62 [border: (10px solid #FF0000)] |
RenderText {#text} at (10,10) size 56x19 |
text run at (10,10) width 56: "Line One" |
RenderBR {BR} at (66,25) size 0x0 |
@@ -266,10 +266,10 @@ layer at (0,0) size 785x2444 |
RenderBlock (floating) {HR} at (112,32) size 2x2 [border: (1px inset #000000)] |
RenderText {#text} at (0,0) size 0x0 |
RenderBR {BR} at (116,30) size 0x19 |
- RenderBlock (anonymous) at (0,2218) size 769x20 |
+ RenderBlock (anonymous) at (0,2210) size 769x20 |
RenderText {#text} at (0,0) size 529x19 |
text run at (0,0) width 529: "The block-level hr below has a percentage width and should still be even with the select." |
- RenderBlock {DIV} at (0,2238) size 220x92 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,2230) size 220x92 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -282,11 +282,11 @@ layer at (0,0) size 785x2444 |
RenderBlock {HR} at (10,52) size 202x2 [border: (1px inset #000000)] |
RenderBlock (anonymous) at (10,62) size 200x20 |
RenderBR {BR} at (0,0) size 0x19 |
- RenderBlock (anonymous) at (0,2330) size 769x20 |
+ RenderBlock (anonymous) at (0,2322) size 769x20 |
RenderText {#text} at (0,0) size 590x19 |
text run at (0,0) width 500: "The block-level hr below has an auto width and should still be even with the select. " |
text run at (500,0) width 90: "It shrinks to fit." |
- RenderBlock {DIV} at (0,2350) size 220x78 [border: (10px solid #FF0000)] |
+ RenderBlock {DIV} at (0,2342) size 220x78 [border: (10px solid #FF0000)] |
RenderBlock (anonymous) at (10,10) size 200x20 |
RenderText {#text} at (0,0) size 56x19 |
text run at (0,0) width 56: "Line One" |
@@ -299,7 +299,7 @@ layer at (0,0) size 785x2444 |
RenderBlock {HR} at (110,38) size 100x2 [border: (1px inset #000000)] |
RenderBlock (anonymous) at (10,48) size 200x20 |
RenderBR {BR} at (100,0) size 0x19 |
-layer at (118,1410) size 100x100 |
+layer at (118,1402) size 100x100 |
RenderBlock (floating) {DIV} at (110,30) size 100x100 |
RenderText {#text} at (0,0) size 99x99 |
text run at (0,0) width 56: "This is an" |
@@ -307,13 +307,13 @@ layer at (118,1410) size 100x100 |
text run at (0,40) width 98: "with enough text" |
text run at (0,60) width 95: "to have to wrap" |
text run at (0,80) width 96: "to multiple lines." |
-layer at (18,1612) size 200x60 |
+layer at (18,1604) size 200x60 |
RenderBlock (floating) {DIV} at (10,52) size 200x60 |
RenderText {#text} at (0,0) size 188x59 |
text run at (0,0) width 188: "This is an overflow section with" |
text run at (0,20) width 184: "enough text to have to wrap to" |
text run at (0,40) width 80: "multiple lines." |
-layer at (118,1732) size 100x100 |
+layer at (118,1724) size 100x100 |
RenderBlock {DIV} at (110,30) size 100x100 |
RenderText {#text} at (0,0) size 99x99 |
text run at (0,0) width 56: "This is an" |
@@ -321,7 +321,7 @@ layer at (118,1732) size 100x100 |
text run at (0,40) width 98: "with enough text" |
text run at (0,60) width 95: "to have to wrap" |
text run at (0,80) width 96: "to multiple lines." |
-layer at (118,1932) size 100x100 |
+layer at (118,1924) size 100x100 |
RenderBlock {DIV} at (110,30) size 100x100 |
RenderText {#text} at (0,0) size 99x99 |
text run at (0,0) width 56: "This is an" |