| 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 9ed07df8bf600a48bdd5b6107a8ed3d47f184d59..6731b2e8627f45cfa7605c607858bcff489d237f 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
|
| @@ -1,6 +1,6 @@
|
| -layer at (0,0) size 785x1715
|
| - RenderView at (0,0) size 785x600
|
| -layer at (0,0) size 785x1715
|
| +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1715
|
| + RenderView at (0,0) size 800x600
|
| +layer at (0,0) size 785x1715 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {HTML} at (0,0) size 785x1715.16
|
| RenderBody {BODY} at (8,16) size 769x1683.16
|
| layer at (8,16) size 750x376
|
| @@ -52,7 +52,7 @@ layer at (8,104) size 750x288
|
| text run at (278,512) width 86: "Lorem ipsum"
|
| text run at (0,528) width 357: "dolor sit amet, consectetuer adipiscing elit. Nulla varius"
|
| text run at (0,544) width 76: "enim ac mi."
|
| -layer at (8,408) size 750x376
|
| +layer at (8,408) size 750x376 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {DIV} at (0,391.81) size 750x375.81 [bgcolor=#EEEEEE]
|
| RenderBlock (anonymous multi-column span) at (0,288) size 750x87.81
|
| RenderBlock {H2} at (0,19.91) size 750x48 [bgcolor=#CCCCCC]
|
| @@ -60,7 +60,7 @@ layer at (8,408) size 750x376
|
| 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,24) width 505: "collapse its margins with the h2 in the next block."
|
| -layer at (8,408) size 750x288
|
| +layer at (8,408) size 750x288 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 750x288
|
| RenderText {#text} at (0,0) size 367x560
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| @@ -101,7 +101,7 @@ layer at (8,408) size 750x288
|
| text run at (278,512) width 86: "Lorem ipsum"
|
| text run at (0,528) width 357: "dolor sit amet, consectetuer adipiscing elit. Nulla varius"
|
| text run at (0,544) width 76: "enim ac mi."
|
| -layer at (8,800) size 750x375
|
| +layer at (8,800) size 750x375 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {DIV} at (0,783.63) size 750x375.81 [bgcolor=#EEEEEE]
|
| RenderBlock (anonymous multi-column span) at (0,0) size 750x87.81
|
| RenderBlock {H2} at (0,19.91) size 750x48 [bgcolor=#CCCCCC]
|
| @@ -109,7 +109,7 @@ layer at (8,800) size 750x375
|
| 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,24) width 623: "should collapse its margins with the h2 in the previous block."
|
| -layer at (8,887) size 750x288
|
| +layer at (8,887) size 750x288 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock (anonymous multi-column) at (0,87.81) size 750x288
|
| RenderText {#text} at (0,0) size 367x560
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| @@ -150,7 +150,7 @@ layer at (8,887) size 750x288
|
| text run at (278,512) width 86: "Lorem ipsum"
|
| text run at (0,528) width 357: "dolor sit amet, consectetuer adipiscing elit. Nulla varius"
|
| text run at (0,544) width 76: "enim ac mi."
|
| -layer at (8,1191) size 750x508
|
| +layer at (8,1191) size 750x508 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock {DIV} at (0,1175.44) size 750x507.72 [bgcolor=#EEEEEE]
|
| RenderBlock (anonymous multi-column span) at (0,176) size 750x155.72
|
| RenderBlock {H2} at (0,19.91) size 750x48 [bgcolor=#CCCCCC]
|
| @@ -163,7 +163,7 @@ layer at (8,1191) size 750x508
|
| 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,24) width 569: "collapse its margins with the spanning element above it."
|
| -layer at (8,1191) size 750x176
|
| +layer at (8,1191) size 750x176 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 750x176
|
| RenderText {#text} at (0,0) size 367x352
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
| @@ -189,7 +189,7 @@ layer at (8,1191) size 750x176
|
| text run at (0,304) width 351: "condimentum vestibulum. Suspendisse hendrerit quam"
|
| text run at (0,320) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
|
| text run at (0,336) width 275: "dolor sit amet, consectetuer adipiscing elit."
|
| -layer at (8,1523) size 750x176
|
| +layer at (8,1523) size 750x176 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| RenderBlock (anonymous multi-column) at (0,331.72) size 750x176
|
| RenderText {#text} at (0,0) size 367x352
|
| text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
|
|