| Index: webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt
|
| diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt
|
| index 79781cf07f86d17246adbb9cdb647c58be88e8c1..d4208b34de118f3757f32dd8167b0c46b6c7278e 100644
|
| --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt
|
| +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt
|
| @@ -1,8 +1,8 @@
|
| -layer at (0,0) size 785x2458
|
| +layer at (0,0) size 785x2450
|
| RenderView at (0,0) size 785x600
|
| -layer at (0,0) size 785x2458
|
| - RenderBlock {HTML} at (0,0) size 785x2458
|
| - RenderBody {BODY} at (8,8) size 769x2442
|
| +layer at (0,0) size 785x2450
|
| + RenderBlock {HTML} at (0,0) size 785x2450
|
| + RenderBody {BODY} at (8,8) size 769x2434
|
| 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 785x2458
|
| 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 220x90 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,94) size 220x88 [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 785x2458
|
| 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,56) size 200x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| - 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,56) size 200x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| + 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,200) size 769x20
|
| + RenderBlock (anonymous) at (0,198) 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,236) size 220x66 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,234) 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 785x2458
|
| 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=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| - 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=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| + 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,318) size 769x20
|
| + RenderBlock (anonymous) at (0,314) 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,354) size 220x86 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,350) 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 785x2458
|
| 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=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| - 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=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| + 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,456) size 769x20
|
| + RenderBlock (anonymous) at (0,450) 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,492) size 220x86 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,486) 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 785x2458
|
| 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=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| - 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=#C0C0C0] [border: (2px outset #C0C0C0)]
|
| + 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,594) size 769x20
|
| + RenderBlock (anonymous) at (0,586) 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,630) size 220x72 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,622) 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 785x2458
|
| 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,718) size 769x40
|
| + RenderBlock (anonymous) at (0,710) 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,774) size 220x136 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,766) size 220x136 [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 785x2458
|
| 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,926) size 769x20
|
| + RenderBlock (anonymous) at (0,918) 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,962) size 220x156 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,954) size 220x156 [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 785x2458
|
| text run at (2,42) width 85: "previous float."
|
| RenderBlock (anonymous) at (10,126) size 200x20
|
| RenderBR {BR} at (0,0) size 0x19
|
| - RenderBlock (anonymous) at (0,1134) size 769x20
|
| + RenderBlock (anonymous) at (0,1126) 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,1170) size 220x172 [border: (10px solid #FF0000)]
|
| + RenderBlock {P} at (0,1162) 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 785x2458
|
| 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,1358) size 769x20
|
| + RenderBlock (anonymous) at (0,1350) 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,1378) size 220x140 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,1370) 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 785x2458
|
| 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,1518) size 769x40
|
| + RenderBlock (anonymous) at (0,1510) 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,1558) size 220x124 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,1550) size 220x124 [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 785x2458
|
| 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,1682) size 769x20
|
| + RenderBlock (anonymous) at (0,1674) 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,1702) size 220x160 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,1694) 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 785x2458
|
| 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,1862) size 769x40
|
| + RenderBlock (anonymous) at (0,1854) 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,1902) size 220x160 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,1894) 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 785x2458
|
| 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,2062) size 769x20
|
| + RenderBlock (anonymous) at (0,2054) 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,2082) size 220x64 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,2074) 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
|
| @@ -251,10 +251,10 @@ layer at (0,0) size 785x2458
|
| 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,2146) size 769x20
|
| + RenderBlock (anonymous) at (0,2138) 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,2166) size 220x64 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,2158) 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
|
| @@ -266,10 +266,10 @@ layer at (0,0) size 785x2458
|
| 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,2230) size 769x20
|
| + RenderBlock (anonymous) at (0,2222) 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,2250) size 220x94 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,2242) size 220x94 [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 785x2458
|
| RenderBlock {HR} at (10,54) size 202x2 [border: (1px inset #000000)]
|
| RenderBlock (anonymous) at (10,64) size 200x20
|
| RenderBR {BR} at (0,0) size 0x19
|
| - RenderBlock (anonymous) at (0,2344) size 769x20
|
| + RenderBlock (anonymous) at (0,2336) 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,2364) size 220x78 [border: (10px solid #FF0000)]
|
| + RenderBlock {DIV} at (0,2356) 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 785x2458
|
| 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,1416) size 100x100
|
| +layer at (118,1408) 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,1416) 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,1620) size 200x60
|
| +layer at (18,1612) size 200x60
|
| RenderBlock (floating) {DIV} at (10,54) 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,1740) size 100x100
|
| +layer at (118,1732) 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,1740) 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,1940) size 100x100
|
| +layer at (118,1932) 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"
|
|
|