| Index: LayoutTests/platform/win/fast/multicol/span/span-margin-collapsing-expected.txt
|
| diff --git a/LayoutTests/platform/win/fast/multicol/span/span-margin-collapsing-expected.txt b/LayoutTests/platform/win/fast/multicol/span/span-margin-collapsing-expected.txt
|
| index 782c0de619ab8ec339e9f8c3158dc480dc49e4a0..4822fc2758c6583a614458091675e2a7959936e9 100644
|
| --- a/LayoutTests/platform/win/fast/multicol/span/span-margin-collapsing-expected.txt
|
| +++ b/LayoutTests/platform/win/fast/multicol/span/span-margin-collapsing-expected.txt
|
| @@ -1,18 +1,18 @@
|
| layer at (0,0) size 785x1929
|
| RenderView at (0,0) size 785x600
|
| layer at (0,0) size 785x1929
|
| - RenderBlock {HTML} at (0,0) size 785x1930
|
| - RenderBody {BODY} at (8,16) size 769x1898
|
| + RenderBlock {HTML} at (0,0) size 785x1929.16
|
| + RenderBody {BODY} at (8,16) size 769x1897.16
|
| layer at (8,16) size 750x414
|
| - RenderBlock {DIV} at (0,0) size 750x414 [bgcolor=#EEEEEE]
|
| - RenderBlock (anonymous multi-column span) at (0,0) size 750x94
|
| - RenderBlock {H2} at (0,19) size 750x55 [bgcolor=#CCCCCC]
|
| + RenderBlock {DIV} at (0,0) size 750x413.81 [bgcolor=#EEEEEE]
|
| + RenderBlock (anonymous multi-column span) at (0,0) size 750x93.81
|
| + RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| RenderText {#text} at (0,0) size 683x53
|
| text run at (0,0) width 666: "This is a spanning element at the beginning of the columns block. "
|
| text run at (666,0) width 17: "It"
|
| text run at (0,27) width 525: "should collapse its margins with the top of the page."
|
| layer at (8,110) size 750x320
|
| - RenderBlock (anonymous multi-column) at (0,93) size 750x321
|
| + RenderBlock (anonymous multi-column) at (0,93.81) size 750x320
|
| RenderText {#text} at (0,0) size 367x639
|
| text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,20) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus."
|
| @@ -50,9 +50,9 @@ layer at (8,110) size 750x320
|
| text run at (25,600) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,620) width 143: "Nulla varius enim ac mi."
|
| layer at (8,446) size 750x414
|
| - RenderBlock {DIV} at (0,429) size 750x415 [bgcolor=#EEEEEE]
|
| - RenderBlock (anonymous multi-column span) at (0,320) size 750x94
|
| - RenderBlock {H2} at (0,19) size 750x55 [bgcolor=#CCCCCC]
|
| + RenderBlock {DIV} at (0,429.81) size 750x413.81 [bgcolor=#EEEEEE]
|
| + RenderBlock (anonymous multi-column span) at (0,320) size 750x93.81
|
| + RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| RenderText {#text} at (0,0) size 692x53
|
| text run at (0,0) width 602: "This is a spanning element at the end of the columns block. "
|
| text run at (602,0) width 90: "It should"
|
| @@ -96,15 +96,15 @@ layer at (8,446) size 750x320
|
| text run at (25,600) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,620) width 143: "Nulla varius enim ac mi."
|
| layer at (8,876) size 750x413
|
| - RenderBlock {DIV} at (0,859) size 750x415 [bgcolor=#EEEEEE]
|
| - RenderBlock (anonymous multi-column span) at (0,0) size 750x94
|
| - RenderBlock {H2} at (0,19) size 750x55 [bgcolor=#CCCCCC]
|
| + RenderBlock {DIV} at (0,859.63) size 750x413.81 [bgcolor=#EEEEEE]
|
| + RenderBlock (anonymous multi-column span) at (0,0) size 750x93.81
|
| + RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| RenderText {#text} at (0,0) size 683x53
|
| text run at (0,0) width 666: "This is a spanning element at the beginning of the columns block. "
|
| text run at (666,0) width 17: "It"
|
| text run at (0,27) width 619: "should collapse its margins with the h2 in the previous block."
|
| layer at (8,969) size 750x320
|
| - RenderBlock (anonymous multi-column) at (0,93) size 750x321
|
| + RenderBlock (anonymous multi-column) at (0,93.81) size 750x320
|
| RenderText {#text} at (0,0) size 367x639
|
| text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,20) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus."
|
| @@ -142,14 +142,14 @@ layer at (8,969) size 750x320
|
| text run at (25,600) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,620) width 143: "Nulla varius enim ac mi."
|
| layer at (8,1305) size 750x608
|
| - RenderBlock {DIV} at (0,1289) size 750x609 [bgcolor=#EEEEEE]
|
| - RenderBlock (anonymous multi-column span) at (0,220) size 750x168
|
| - RenderBlock {H2} at (0,19) size 750x55 [bgcolor=#CCCCCC]
|
| + RenderBlock {DIV} at (0,1289.44) size 750x607.72 [bgcolor=#EEEEEE]
|
| + RenderBlock (anonymous multi-column span) at (0,220) size 750x167.72
|
| + RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| RenderText {#text} at (0,0) size 725x53
|
| text run at (0,0) width 635: "This is a spanning element in the middle of the columns block. "
|
| text run at (635,0) width 90: "It should"
|
| text run at (0,27) width 567: "collapse its margins with the spanning element below it."
|
| - RenderBlock {H2} at (0,93) size 750x55 [bgcolor=#CCCCCC]
|
| + RenderBlock {H2} at (0,93.81) size 750x54 [bgcolor=#CCCCCC]
|
| RenderText {#text} at (0,0) size 725x53
|
| text run at (0,0) width 635: "This is a spanning element in the middle of the columns block. "
|
| text run at (635,0) width 90: "It should"
|
| @@ -180,7 +180,7 @@ layer at (8,1305) size 750x220
|
| text run at (0,380) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing"
|
| text run at (0,400) width 21: "elit."
|
| layer at (8,1693) size 750x220
|
| - RenderBlock (anonymous multi-column) at (0,387) size 750x221
|
| + RenderBlock (anonymous multi-column) at (0,387.72) size 750x220
|
| RenderText {#text} at (0,0) size 367x419
|
| text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,20) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus."
|
|
|