| Index: LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt
|
| diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt b/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt
|
| index 5d725a1862cbdf9e70b07643210f617f4c3a3629..52ebceaff5906278329a7c7f83c9e48c642fb046 100644
|
| --- a/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt
|
| +++ b/LayoutTests/platform/mac/fast/multicol/span/span-margin-collapsing-expected.txt
|
| @@ -5,14 +5,14 @@ layer at (0,0) size 785x1907 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| LayoutBlockFlow {BODY} at (8,16) size 769x1875.16
|
| layer at (8,16) size 750x420
|
| LayoutBlockFlow {DIV} at (0,0) size 750x419.81 [bgcolor=#EEEEEE]
|
| - LayoutBlockFlow (anonymous multi-column span) at (0,0) size 750x95.81
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column span) at (0,0) size 750x95.81
|
| LayoutBlockFlow {H2} at (0,19.91) size 750x56 [bgcolor=#CCCCCC]
|
| LayoutText {#text} at (0,0) size 689x56
|
| 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,28) width 529: "should collapse its margins with the top of the page."
|
| layer at (8,112) size 750x324
|
| - LayoutBlockFlow (anonymous multi-column) at (0,95.81) size 750x324
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column) at (0,95.81) size 750x324
|
| LayoutText {#text} at (0,0) size 367x630
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
|
| @@ -54,14 +54,14 @@ layer at (8,112) size 750x324
|
| text run at (0,612) width 76: "enim ac mi."
|
| layer at (8,452) size 750x420 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| LayoutBlockFlow {DIV} at (0,435.81) size 750x419.81 [bgcolor=#EEEEEE]
|
| - LayoutBlockFlow (anonymous multi-column span) at (0,324) size 750x95.81
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column span) at (0,324) size 750x95.81
|
| LayoutBlockFlow {H2} at (0,19.91) size 750x56 [bgcolor=#CCCCCC]
|
| LayoutText {#text} at (0,0) size 699x56
|
| 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,28) width 505: "collapse its margins with the h2 in the next block."
|
| layer at (8,452) size 750x324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - LayoutBlockFlow (anonymous multi-column) at (0,0) size 750x324
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column) at (0,0) size 750x324
|
| LayoutText {#text} at (0,0) size 367x630
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
|
| @@ -103,14 +103,14 @@ layer at (8,452) size 750x324 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (0,612) width 76: "enim ac mi."
|
| layer at (8,888) size 750x419 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| LayoutBlockFlow {DIV} at (0,871.63) size 750x419.81 [bgcolor=#EEEEEE]
|
| - LayoutBlockFlow (anonymous multi-column span) at (0,0) size 750x95.81
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column span) at (0,0) size 750x95.81
|
| LayoutBlockFlow {H2} at (0,19.91) size 750x56 [bgcolor=#CCCCCC]
|
| LayoutText {#text} at (0,0) size 689x56
|
| 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,28) width 623: "should collapse its margins with the h2 in the previous block."
|
| layer at (8,983) size 750x324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - LayoutBlockFlow (anonymous multi-column) at (0,95.81) size 750x324
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column) at (0,95.81) size 750x324
|
| LayoutText {#text} at (0,0) size 367x630
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
|
| @@ -152,7 +152,7 @@ layer at (8,983) size 750x324 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (0,612) width 76: "enim ac mi."
|
| layer at (8,1323) size 750x568 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| LayoutBlockFlow {DIV} at (0,1307.44) size 750x567.72 [bgcolor=#EEEEEE]
|
| - LayoutBlockFlow (anonymous multi-column span) at (0,198) size 750x171.72
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column span) at (0,198) size 750x171.72
|
| LayoutBlockFlow {H2} at (0,19.91) size 750x56 [bgcolor=#CCCCCC]
|
| LayoutText {#text} at (0,0) size 733x56
|
| text run at (0,0) width 641: "This is a spanning element in the middle of the columns block. "
|
| @@ -164,7 +164,7 @@ layer at (8,1323) size 750x568 backgroundClip at (0,0) size 785x600 clip at (0,0
|
| text run at (640,0) width 93: "It should"
|
| text run at (0,28) width 569: "collapse its margins with the spanning element above it."
|
| layer at (8,1323) size 750x198 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - LayoutBlockFlow (anonymous multi-column) at (0,0) size 750x198
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column) at (0,0) size 750x198
|
| LayoutText {#text} at (0,0) size 367x396
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
|
| @@ -190,7 +190,7 @@ layer at (8,1323) size 750x198 backgroundClip at (0,0) size 785x600 clip at (0,0
|
| 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,1693) size 750x198 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - LayoutBlockFlow (anonymous multi-column) at (0,369.72) size 750x198
|
| + LayoutBlockFlow (anonymous) (anonymous multi-column) at (0,369.72) size 750x198
|
| LayoutText {#text} at (0,0) size 367x396
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
|
|
|