| 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 0c4767825594fc1090e73abac49b946f66bb088e..3d4df8fd2c9d64bb02f7bcc6bf89f56e54ca2d47 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,6 +1,6 @@
|
| -layer at (0,0) size 785x1897
|
| - RenderView at (0,0) size 785x600
|
| -layer at (0,0) size 785x1897
|
| +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1897
|
| + RenderView at (0,0) size 800x600
|
| +layer at (0,0) size 785x1897 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {HTML} at (0,0) size 785x1897.16
|
| RenderBody {BODY} at (8,16) size 769x1865.16
|
| layer at (8,16) size 750x418
|
| @@ -52,7 +52,7 @@ layer at (8,110) size 750x324
|
| text run at (278,576) width 86: "Lorem ipsum"
|
| text run at (0,594) width 357: "dolor sit amet, consectetuer adipiscing elit. Nulla varius"
|
| text run at (0,612) width 76: "enim ac mi."
|
| -layer at (8,450) size 750x418
|
| +layer at (8,450) size 750x418 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {DIV} at (0,433.81) size 750x417.81 [bgcolor=#EEEEEE]
|
| RenderBlock (anonymous multi-column span) at (0,324) size 750x93.81
|
| RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| @@ -60,7 +60,7 @@ layer at (8,450) size 750x418
|
| text run at (0,0) width 608: "This is a spanning element at the end of the columns block. "
|
| text run at (607,0) width 92: "It should"
|
| text run at (0,27) width 505: "collapse its margins with the h2 in the next block."
|
| -layer at (8,450) size 750x324
|
| +layer at (8,450) size 750x324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock (anonymous multi-column) at (0,0) size 750x324
|
| RenderText {#text} at (0,0) size 367x629
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| @@ -101,7 +101,7 @@ layer at (8,450) size 750x324
|
| text run at (278,576) width 86: "Lorem ipsum"
|
| text run at (0,594) width 357: "dolor sit amet, consectetuer adipiscing elit. Nulla varius"
|
| text run at (0,612) width 76: "enim ac mi."
|
| -layer at (8,884) size 750x417
|
| +layer at (8,884) size 750x417 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {DIV} at (0,867.63) size 750x417.81 [bgcolor=#EEEEEE]
|
| RenderBlock (anonymous multi-column span) at (0,0) size 750x93.81
|
| RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| @@ -109,7 +109,7 @@ layer at (8,884) size 750x417
|
| text run at (0,0) width 672: "This is a spanning element at the beginning of the columns block. "
|
| text run at (671,0) width 18: "It"
|
| text run at (0,27) width 623: "should collapse its margins with the h2 in the previous block."
|
| -layer at (8,977) size 750x324
|
| +layer at (8,977) size 750x324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock (anonymous multi-column) at (0,93.81) size 750x324
|
| RenderText {#text} at (0,0) size 367x629
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| @@ -150,7 +150,7 @@ layer at (8,977) size 750x324
|
| text run at (278,576) width 86: "Lorem ipsum"
|
| text run at (0,594) width 357: "dolor sit amet, consectetuer adipiscing elit. Nulla varius"
|
| text run at (0,612) width 76: "enim ac mi."
|
| -layer at (8,1317) size 750x564
|
| +layer at (8,1317) size 750x564 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {DIV} at (0,1301.44) size 750x563.72 [bgcolor=#EEEEEE]
|
| RenderBlock (anonymous multi-column span) at (0,198) size 750x167.72
|
| RenderBlock {H2} at (0,19.91) size 750x54 [bgcolor=#CCCCCC]
|
| @@ -163,7 +163,7 @@ layer at (8,1317) size 750x564
|
| text run at (0,0) width 641: "This is a spanning element in the middle of the columns block. "
|
| text run at (640,0) width 93: "It should"
|
| text run at (0,27) width 569: "collapse its margins with the spanning element above it."
|
| -layer at (8,1317) size 750x198
|
| +layer at (8,1317) size 750x198 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock (anonymous multi-column) at (0,0) size 750x198
|
| RenderText {#text} at (0,0) size 367x395
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| @@ -189,7 +189,7 @@ layer at (8,1317) size 750x198
|
| text run at (0,342) width 351: "condimentum vestibulum. Suspendisse hendrerit quam"
|
| text run at (0,360) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
|
| text run at (0,378) width 275: "dolor sit amet, consectetuer adipiscing elit."
|
| -layer at (8,1683) size 750x198
|
| +layer at (8,1683) size 750x198 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock (anonymous multi-column) at (0,365.72) size 750x198
|
| RenderText {#text} at (0,0) size 367x395
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
|
|