Index: LayoutTests/platform/win-xp/fast/multicol/span/span-margin-collapsing-expected.txt |
diff --git a/LayoutTests/platform/win-xp/fast/multicol/span/span-margin-collapsing-expected.txt b/LayoutTests/platform/win-xp/fast/multicol/span/span-margin-collapsing-expected.txt |
index 4822fc2758c6583a614458091675e2a7959936e9..72fe67fb6deeccd0a1ae5101e42066bd56ff674d 100644 |
--- a/LayoutTests/platform/win-xp/fast/multicol/span/span-margin-collapsing-expected.txt |
+++ b/LayoutTests/platform/win-xp/fast/multicol/span/span-margin-collapsing-expected.txt |
@@ -1,6 +1,6 @@ |
-layer at (0,0) size 785x1929 |
- RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x1929 |
+layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1929 |
+ RenderView at (0,0) size 800x600 |
+layer at (0,0) size 785x1929 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
RenderBlock {HTML} at (0,0) size 785x1929.16 |
RenderBody {BODY} at (8,16) size 769x1897.16 |
layer at (8,16) size 750x414 |
@@ -49,7 +49,7 @@ layer at (8,110) size 750x320 |
text run at (0,600) width 25: "elit. " |
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 |
+layer at (8,446) size 750x414 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
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] |
@@ -57,7 +57,7 @@ layer at (8,446) size 750x414 |
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" |
text run at (0,27) width 503: "collapse its margins with the h2 in the next block." |
-layer at (8,446) size 750x320 |
+layer at (8,446) size 750x320 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 750x320 |
RenderText {#text} at (0,0) size 367x639 |
text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
@@ -95,7 +95,7 @@ layer at (8,446) size 750x320 |
text run at (0,600) width 25: "elit. " |
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 |
+layer at (8,876) size 750x413 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
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] |
@@ -103,7 +103,7 @@ layer at (8,876) size 750x413 |
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 |
+layer at (8,969) size 750x320 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 750x320 |
RenderText {#text} at (0,0) size 367x639 |
text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
@@ -141,7 +141,7 @@ layer at (8,969) size 750x320 |
text run at (0,600) width 25: "elit. " |
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 |
+layer at (8,1305) size 750x608 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
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] |
@@ -154,7 +154,7 @@ layer at (8,1305) size 750x608 |
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 566: "collapse its margins with the spanning element above it." |
-layer at (8,1305) size 750x220 |
+layer at (8,1305) size 750x220 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 750x220 |
RenderText {#text} at (0,0) size 367x419 |
text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
@@ -179,7 +179,7 @@ layer at (8,1305) size 750x220 |
text run at (0,360) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
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 |
+layer at (8,1693) size 750x220 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
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." |