Index: LayoutTests/platform/linux/virtual/regionbasedmulticol/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt |
diff --git a/LayoutTests/platform/linux/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/linux/virtual/regionbasedmulticol/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt |
similarity index 52% |
copy from LayoutTests/platform/linux/fast/multicol/span/span-as-nested-columns-child-expected.txt |
copy to LayoutTests/platform/linux/virtual/regionbasedmulticol/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt |
index 745bc67763988079c10e62f363058d68e749a2db..fdeb1fe759bed969ed86b418adbc253c7498c477 100644 |
--- a/LayoutTests/platform/linux/fast/multicol/span/span-as-nested-columns-child-expected.txt |
+++ b/LayoutTests/platform/linux/virtual/regionbasedmulticol/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt |
@@ -1,68 +1,23 @@ |
-layer at (0,0) size 785x1406 |
+layer at (0,0) size 785x1593 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x1406 |
- RenderBlock {HTML} at (0,0) size 785x1406.44 |
- RenderBody {BODY} at (8,16) size 769x1374.44 |
-layer at (8,16) size 760x441 |
- RenderBlock {DIV} at (0,0) size 760x440.81 [border: (5px solid #800000)] |
- RenderBlock (anonymous multi-column span) at (5,13) size 750x66.81 [color=#FFFFFF] |
- RenderBlock {H2} at (0,19.91) size 750x27 [color=#000000] [bgcolor=#EEEEEE] |
- RenderText {#text} at (0,0) size 660x26 |
- text run at (0,0) width 660: "This is a spanning element at the beginning of the columns block." |
-layer at (13,21) size 750x8 |
- RenderBlock (anonymous multi-column) at (5,5) size 750x8 |
- RenderBlock {SPAN} at (0,8) size 367x0 [color=#FFFFFF] [bgcolor=#000000] |
-layer at (13,96) size 750x356 |
- RenderBlock (anonymous multi-column) at (5,79.81) size 750x356 |
- RenderBlock {SPAN} at (0,16) size 367x220 [color=#FFFFFF] [bgcolor=#000000] |
- RenderText {#text} at (0,0) size 367x219 |
- 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." |
- text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
- text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
- text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
- text run at (0,100) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
- text run at (0,120) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
- text run at (0,140) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
- text run at (0,160) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
- text run at (0,180) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,200) width 21: "elit." |
- RenderBlock (anonymous) at (0,252) size 367x444 |
- RenderText {#text} at (0,0) size 367x443 |
- 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." |
- text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
- text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
- text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
- text run at (0,104) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
- text run at (0,124) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
- text run at (0,144) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
- text run at (0,164) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
- text run at (0,184) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,204) width 25: "elit. " |
- text run at (25,204) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
- text run at (0,224) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus." |
- text run at (0,244) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
- text run at (0,264) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
- text run at (0,284) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
- text run at (0,304) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
- text run at (0,324) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
- text run at (0,344) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
- text run at (0,364) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
- text run at (0,384) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,404) width 25: "elit. " |
- text run at (25,404) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
- text run at (0,424) width 143: "Nulla varius enim ac mi." |
-layer at (8,473) size 760x437 |
- RenderBlock {DIV} at (0,456.81) size 760x436.81 [border: (5px solid #800000)] |
- RenderBlock (anonymous multi-column span) at (5,357) size 750x66.81 [color=#FFFFFF] |
- RenderBlock {H2} at (0,19.91) size 750x27 [color=#000000] [bgcolor=#EEEEEE] |
- RenderText {#text} at (0,0) size 596x26 |
- text run at (0,0) width 596: "This is a spanning element at the end of the columns block." |
-layer at (13,478) size 750x352 |
- RenderBlock (anonymous multi-column) at (5,5) size 750x352 |
- RenderBlock (anonymous) at (0,0) size 367x432 |
- RenderText {#text} at (0,0) size 367x431 |
+layer at (0,0) size 785x1593 |
+ RenderBlock {HTML} at (0,0) size 785x1592.88 |
+ RenderBody {BODY} at (8,16) size 769x1560.88 |
+layer at (8,16) size 760x504 |
+ RenderBlock {DIV} at (0,0) size 760x503.63 [border: (5px solid #800000)] |
+ RenderMultiColumnSet at (5,5) size 750x220 |
+ RenderBlock {H2} at (5,244.91) size 750x27 [bgcolor=#EEEEEE] |
+ RenderText {#text} at (0,0) size 191x26 |
+ text run at (0,0) width 191: "This is a first span." |
+ RenderMultiColumnSet at (5,291.81) size 750x20 |
+ RenderBlock {H2} at (5,331.72) size 750x27 [bgcolor=#EEEEEE] |
+ RenderText {#text} at (0,0) size 218x26 |
+ text run at (0,0) width 218: "This is a second span." |
+ RenderMultiColumnSet at (5,378.63) size 750x120 |
+layer at (13,21) size 367x700 |
+ RenderMultiColumnFlowThread at (5,5) size 367x700 |
+ RenderBlock (anonymous) at (0,0) size 367x420 |
+ 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." |
text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
@@ -81,11 +36,16 @@ layer at (13,478) size 750x352 |
text run at (0,280) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
text run at (0,300) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
text run at (0,320) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
- text run at (0,352) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
- text run at (0,372) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
- text run at (0,392) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,412) width 21: "elit." |
- RenderBlock {SPAN} at (0,448) size 367x240 [color=#FFFFFF] [bgcolor=#000000] |
+ text run at (0,340) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
+ 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." |
+ RenderMultiColumnSpannerPlaceholder at (0,420) size 0x0 |
+ RenderBlock (anonymous) at (0,440) size 367x20 |
+ RenderText {#text} at (0,0) size 349x19 |
+ text run at (0,0) width 349: "This text should be sitting between two spanning elements." |
+ RenderMultiColumnSpannerPlaceholder at (0,460) size 0x0 |
+ RenderBlock (anonymous) at (0,460) size 367x240 |
RenderText {#text} at (0,0) size 367x239 |
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." |
@@ -100,39 +60,49 @@ layer at (13,478) size 750x352 |
text run at (0,200) width 25: "elit. " |
text run at (25,200) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
text run at (0,220) width 143: "Nulla varius enim ac mi." |
-layer at (13,897) size 750x8 |
- RenderBlock (anonymous multi-column) at (5,423.81) size 750x8 |
- RenderBlock {SPAN} at (0,8) size 367x0 [color=#FFFFFF] [bgcolor=#000000] |
- RenderText {#text} at (0,0) size 0x0 |
-layer at (8,926) size 760x464 |
- RenderBlock {DIV} at (0,909.63) size 760x464.81 [border: (5px solid #800000)] |
- RenderBlock (anonymous multi-column span) at (5,157) size 750x66.81 [color=#FFFFFF] |
- RenderBlock {H2} at (0,19.91) size 750x27 [color=#000000] [bgcolor=#EEEEEE] |
- RenderText {#text} at (0,0) size 629x26 |
- text run at (0,0) width 629: "This is a spanning element in the middle of the columns block." |
-layer at (13,931) size 750x152 |
- RenderBlock (anonymous multi-column) at (5,5) size 750x152 |
- RenderBlock (anonymous) at (0,0) size 367x232 |
- RenderText {#text} at (0,0) size 367x231 |
+layer at (8,536) size 760x515 |
+ RenderBlock {DIV} at (0,519.63) size 760x515.63 [border: (5px solid #800000)] |
+ RenderMultiColumnSet at (5,5) size 750x126 |
+ RenderBlock {H2} at (5,150.91) size 750x27 [bgcolor=#EEEEEE] |
+ RenderText {#text} at (0,0) size 191x26 |
+ text run at (0,0) width 191: "This is a first span." |
+ RenderMultiColumnSet at (5,197.81) size 750x126 |
+ RenderBlock {H2} at (5,343.72) size 750x27 [bgcolor=#EEEEEE] |
+ RenderText {#text} at (0,0) size 218x26 |
+ text run at (0,0) width 218: "This is a second span." |
+ RenderMultiColumnSet at (5,390.63) size 750x120 |
+layer at (13,541) size 367x744 |
+ RenderMultiColumnFlowThread at (5,5) size 367x744 |
+ RenderBlock {P} at (0,16) size 367x230 |
+ RenderText {#text} at (0,0) size 367x229 |
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." |
text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
- text run at (0,100) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
- text run at (0,120) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
- text run at (0,152) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
- text run at (0,172) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
- text run at (0,192) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,212) width 21: "elit." |
- RenderBlock {SPAN} at (0,248) size 367x40 [color=#FFFFFF] [bgcolor=#000000] |
- RenderText {#text} at (0,0) size 337x39 |
+ text run at (0,110) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
+ text run at (0,130) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
+ text run at (0,150) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
+ text run at (0,170) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
+ text run at (0,190) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
+ text run at (0,210) width 21: "elit." |
+ RenderMultiColumnSpannerPlaceholder at (0,252) size 0x0 |
+ RenderBlock {P} at (0,268) size 367x230 |
+ RenderText {#text} at (0,0) size 367x229 |
text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
- text run at (0,20) width 143: "Nulla varius enim ac mi." |
-layer at (13,1149) size 750x236 |
- RenderBlock (anonymous multi-column) at (5,223.81) size 750x236 |
- RenderBlock {SPAN} at (0,16) size 367x220 [color=#FFFFFF] [bgcolor=#000000] |
- RenderText {#text} at (0,0) size 367x219 |
+ text run at (0,20) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus." |
+ text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
+ text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
+ text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
+ text run at (0,110) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
+ text run at (0,130) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
+ text run at (0,150) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
+ text run at (0,170) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
+ text run at (0,190) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
+ text run at (0,210) width 21: "elit." |
+ RenderMultiColumnSpannerPlaceholder at (0,504) size 0x0 |
+ RenderBlock (anonymous) at (0,504) size 367x240 |
+ RenderText {#text} at (0,0) size 367x239 |
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." |
text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
@@ -143,9 +113,59 @@ layer at (13,1149) size 750x236 |
text run at (0,140) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
text run at (0,160) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
text run at (0,180) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,200) width 21: "elit." |
- RenderBlock (anonymous) at (0,252) size 367x220 |
- RenderText {#text} at (0,0) size 367x219 |
+ text run at (0,200) width 25: "elit. " |
+ text run at (25,200) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
+ text run at (0,220) width 143: "Nulla varius enim ac mi." |
+layer at (8,1067) size 760x510 |
+ RenderBlock {DIV} at (0,1051.25) size 760x509.63 [border: (5px solid #800000)] |
+ RenderMultiColumnSet at (5,5) size 750x120 |
+ RenderBlock {H2} at (5,144.91) size 750x27 [bgcolor=#EEEEEE] |
+ RenderText {#text} at (0,0) size 191x26 |
+ text run at (0,0) width 191: "This is a first span." |
+ RenderMultiColumnSet at (5,191.81) size 750x126 |
+ RenderBlock {H2} at (5,337.72) size 750x27 [bgcolor=#EEEEEE] |
+ RenderText {#text} at (0,0) size 218x26 |
+ text run at (0,0) width 218: "This is a second span." |
+ RenderMultiColumnSet at (5,384.63) size 750x120 |
+layer at (13,1072) size 367x732 backgroundClip at (0,0) size 785x1593 clip at (0,0) size 785x1593 outlineClip at (0,0) size 785x1593 |
+ RenderMultiColumnFlowThread at (5,5) size 367x732 |
+ RenderBlock (anonymous) at (0,0) size 367x0 |
+ RenderInline {SPAN} at (0,0) size 0x0 |
+ RenderText {#text} at (0,0) size 0x0 |
+ RenderBlock (anonymous) at (0,0) size 367x220 |
+ RenderBlock {SPAN} at (0,0) size 367x220 |
+ RenderText {#text} at (0,0) size 367x219 |
+ 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." |
+ text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
+ text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
+ text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
+ text run at (0,100) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
+ text run at (0,120) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
+ text run at (0,140) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
+ text run at (0,160) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
+ text run at (0,180) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
+ text run at (0,200) width 21: "elit." |
+ RenderBlock (anonymous) at (0,220) size 367x0 |
+ RenderInline {SPAN} at (0,0) size 0x0 |
+ RenderText {#text} at (0,0) size 0x0 |
+ RenderMultiColumnSpannerPlaceholder at (0,220) size 0x0 |
+ RenderBlock {P} at (0,256) size 367x230 |
+ RenderText {#text} at (0,0) size 367x229 |
+ 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." |
+ text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
+ text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis" |
+ text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim." |
+ text run at (0,110) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci," |
+ text run at (0,130) width 309: "tempus euismod, pretium quis, interdum vitae, nulla." |
+ text run at (0,150) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
+ text run at (0,170) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
+ text run at (0,190) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
+ text run at (0,210) width 21: "elit." |
+ RenderMultiColumnSpannerPlaceholder at (0,492) size 0x0 |
+ RenderBlock (anonymous) at (0,492) size 367x240 |
+ RenderText {#text} at (0,0) size 367x239 |
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." |
text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate" |
@@ -156,4 +176,6 @@ layer at (13,1149) size 750x236 |
text run at (0,140) width 321: "Phasellus eget ante et tortor condimentum vestibulum." |
text run at (0,160) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae" |
text run at (0,180) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing" |
- text run at (0,200) width 21: "elit." |
+ text run at (0,200) width 25: "elit. " |
+ text run at (25,200) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit." |
+ text run at (0,220) width 143: "Nulla varius enim ac mi." |