[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 13:33:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8f8fcb66e37f1a5ccc7de4f657ea89defa7ae20a
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 20 10:57:01 2010 +0000
Unreviewed. Update Qt specific expected results after r67660.
Paginate and column-break at layout time rather than when painting
https://bugs.webkit.org/show_bug.cgi?id=38402
* platform/qt/fast/multicol/client-rects-expected.txt:
* platform/qt/fast/multicol/column-count-with-rules-expected.txt:
* platform/qt/fast/multicol/float-paginate-expected.txt:
* platform/qt/fast/multicol/layers-in-multicol-expected.txt:
* platform/qt/fast/multicol/nested-columns-expected.txt:
* platform/qt/fast/multicol/paginate-block-replaced-expected.txt:
* platform/qt/fast/multicol/positioned-with-constrained-height-expected.txt:
* platform/qt/fast/multicol/span/anonymous-style-inheritance-expected.txt:
* platform/qt/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt:
* platform/qt/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt:
* platform/qt/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt:
* platform/qt/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt:
* platform/qt/fast/multicol/span/span-as-immediate-columns-child-expected.txt:
* platform/qt/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt:
* platform/qt/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt:
* platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt:
* platform/qt/fast/multicol/span/span-margin-collapsing-expected.txt:
* platform/qt/fast/repaint/multicol-repaint-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4453023..93cb93e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,29 @@
+2010-09-20 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed. Update Qt specific expected results after r67660.
+
+ Paginate and column-break at layout time rather than when painting
+ https://bugs.webkit.org/show_bug.cgi?id=38402
+
+ * platform/qt/fast/multicol/client-rects-expected.txt:
+ * platform/qt/fast/multicol/column-count-with-rules-expected.txt:
+ * platform/qt/fast/multicol/float-paginate-expected.txt:
+ * platform/qt/fast/multicol/layers-in-multicol-expected.txt:
+ * platform/qt/fast/multicol/nested-columns-expected.txt:
+ * platform/qt/fast/multicol/paginate-block-replaced-expected.txt:
+ * platform/qt/fast/multicol/positioned-with-constrained-height-expected.txt:
+ * platform/qt/fast/multicol/span/anonymous-style-inheritance-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-immediate-columns-child-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+ * platform/qt/fast/multicol/span/span-margin-collapsing-expected.txt:
+ * platform/qt/fast/repaint/multicol-repaint-expected.txt:
+
2010-09-20 James Kozianski <koz at chromium.org>
Reviewed by Ojan Vafai.
diff --git a/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt b/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt
index f6c76e0..fd01e25 100644
--- a/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/client-rects-expected.txt
@@ -71,7 +71,7 @@ layer at (8,514) size 136x76
RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
layer at (8,643) size 136x76
RenderBlock {DIV} at (0,635) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBlock {DIV} at (13,53) size 25x25 [bgcolor=#ADD8E6]
+ RenderBlock {DIV} at (13,13) size 25x25 [bgcolor=#ADD8E6]
layer at (21,122) size 25x24
RenderBlock (positioned) {DIV} at (21,122) size 25x24 [border: (3px solid #0000FF7F)]
layer at (81,97) size 25x24
@@ -98,5 +98,5 @@ layer at (83,443) size 25x25
RenderBlock (positioned) {DIV} at (83,443) size 25x25 [border: (3px solid #0000FF7F)]
layer at (81,527) size 25x25
RenderBlock (positioned) {DIV} at (81,527) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,646) size 25x25
- RenderBlock (positioned) {DIV} at (81,646) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,656) size 25x25
+ RenderBlock (positioned) {DIV} at (21,656) size 25x25 [border: (3px solid #0000FF7F)]
diff --git a/LayoutTests/platform/qt/fast/multicol/column-count-with-rules-expected.txt b/LayoutTests/platform/qt/fast/multicol/column-count-with-rules-expected.txt
index 880a4db..9d0f648 100644
--- a/LayoutTests/platform/qt/fast/multicol/column-count-with-rules-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/column-count-with-rules-expected.txt
@@ -17,33 +17,33 @@ layer at (8,8) size 998x160
RenderText {#text} at (30,93) size 169x21
text run at (30,93) width 169: "This is some column text."
RenderBR {BR} at (199,109) size 0x0
- RenderText {#text} at (30,114) size 169x21
- text run at (30,114) width 169: "This is some column text."
- RenderBR {BR} at (199,130) size 0x0
- RenderText {#text} at (30,135) size 169x21
- text run at (30,135) width 169: "This is some column text."
- RenderBR {BR} at (199,151) size 0x0
- RenderText {#text} at (30,156) size 169x21
- text run at (30,156) width 169: "This is some column text."
- RenderBR {BR} at (199,172) size 0x0
- RenderText {#text} at (30,177) size 169x21
- text run at (30,177) width 169: "This is some column text."
- RenderBR {BR} at (199,193) size 0x0
- RenderText {#text} at (30,198) size 169x21
- text run at (30,198) width 169: "This is some column text."
- RenderBR {BR} at (199,214) size 0x0
- RenderText {#text} at (30,219) size 169x21
- text run at (30,219) width 169: "This is some column text."
- RenderBR {BR} at (199,235) size 0x0
- RenderText {#text} at (30,240) size 169x21
- text run at (30,240) width 169: "This is some column text."
- RenderBR {BR} at (199,256) size 0x0
- RenderText {#text} at (30,261) size 169x21
- text run at (30,261) width 169: "This is some column text."
- RenderBR {BR} at (199,277) size 0x0
- RenderText {#text} at (30,282) size 169x21
- text run at (30,282) width 169: "This is some column text."
- RenderBR {BR} at (199,298) size 0x0
+ RenderText {#text} at (30,130) size 169x21
+ text run at (30,130) width 169: "This is some column text."
+ RenderBR {BR} at (199,146) size 0x0
+ RenderText {#text} at (30,151) size 169x21
+ text run at (30,151) width 169: "This is some column text."
+ RenderBR {BR} at (199,167) size 0x0
+ RenderText {#text} at (30,172) size 169x21
+ text run at (30,172) width 169: "This is some column text."
+ RenderBR {BR} at (199,188) size 0x0
+ RenderText {#text} at (30,193) size 169x21
+ text run at (30,193) width 169: "This is some column text."
+ RenderBR {BR} at (199,209) size 0x0
+ RenderText {#text} at (30,230) size 169x21
+ text run at (30,230) width 169: "This is some column text."
+ RenderBR {BR} at (199,246) size 0x0
+ RenderText {#text} at (30,251) size 169x21
+ text run at (30,251) width 169: "This is some column text."
+ RenderBR {BR} at (199,267) size 0x0
+ RenderText {#text} at (30,272) size 169x21
+ text run at (30,272) width 169: "This is some column text."
+ RenderBR {BR} at (199,288) size 0x0
+ RenderText {#text} at (30,293) size 169x21
+ text run at (30,293) width 169: "This is some column text."
+ RenderBR {BR} at (199,309) size 0x0
+ RenderText {#text} at (30,330) size 169x21
+ text run at (30,330) width 169: "This is some column text."
+ RenderBR {BR} at (199,346) size 0x0
layer at (8,184) size 784x160
RenderBlock {P} at (0,176) size 784x160 [border: (10px solid #800000)]
RenderText {#text} at (91,30) size 169x21
@@ -62,39 +62,39 @@ layer at (8,184) size 784x160
text run at (91,93) width 4 RTL: "."
text run at (95,93) width 165: "This is some column text"
RenderBR {BR} at (91,109) size 0x0
- RenderText {#text} at (91,114) size 169x21
- text run at (91,114) width 4 RTL: "."
- text run at (95,114) width 165: "This is some column text"
- RenderBR {BR} at (91,130) size 0x0
- RenderText {#text} at (91,135) size 169x21
- text run at (91,135) width 4 RTL: "."
- text run at (95,135) width 165: "This is some column text"
- RenderBR {BR} at (91,151) size 0x0
- RenderText {#text} at (91,156) size 169x21
- text run at (91,156) width 4 RTL: "."
- text run at (95,156) width 165: "This is some column text"
- RenderBR {BR} at (91,172) size 0x0
- RenderText {#text} at (91,177) size 169x21
- text run at (91,177) width 4 RTL: "."
- text run at (95,177) width 165: "This is some column text"
- RenderBR {BR} at (91,193) size 0x0
- RenderText {#text} at (91,198) size 169x21
- text run at (91,198) width 4 RTL: "."
- text run at (95,198) width 165: "This is some column text"
- RenderBR {BR} at (91,214) size 0x0
- RenderText {#text} at (91,219) size 169x21
- text run at (91,219) width 4 RTL: "."
- text run at (95,219) width 165: "This is some column text"
- RenderBR {BR} at (91,235) size 0x0
- RenderText {#text} at (91,240) size 169x21
- text run at (91,240) width 4 RTL: "."
- text run at (95,240) width 165: "This is some column text"
- RenderBR {BR} at (91,256) size 0x0
- RenderText {#text} at (91,261) size 169x21
- text run at (91,261) width 4 RTL: "."
- text run at (95,261) width 165: "This is some column text"
- RenderBR {BR} at (91,277) size 0x0
- RenderText {#text} at (91,282) size 169x21
- text run at (91,282) width 4 RTL: "."
- text run at (95,282) width 165: "This is some column text"
- RenderBR {BR} at (91,298) size 0x0
+ RenderText {#text} at (91,130) size 169x21
+ text run at (91,130) width 4 RTL: "."
+ text run at (95,130) width 165: "This is some column text"
+ RenderBR {BR} at (91,146) size 0x0
+ RenderText {#text} at (91,151) size 169x21
+ text run at (91,151) width 4 RTL: "."
+ text run at (95,151) width 165: "This is some column text"
+ RenderBR {BR} at (91,167) size 0x0
+ RenderText {#text} at (91,172) size 169x21
+ text run at (91,172) width 4 RTL: "."
+ text run at (95,172) width 165: "This is some column text"
+ RenderBR {BR} at (91,188) size 0x0
+ RenderText {#text} at (91,193) size 169x21
+ text run at (91,193) width 4 RTL: "."
+ text run at (95,193) width 165: "This is some column text"
+ RenderBR {BR} at (91,209) size 0x0
+ RenderText {#text} at (91,230) size 169x21
+ text run at (91,230) width 4 RTL: "."
+ text run at (95,230) width 165: "This is some column text"
+ RenderBR {BR} at (91,246) size 0x0
+ RenderText {#text} at (91,251) size 169x21
+ text run at (91,251) width 4 RTL: "."
+ text run at (95,251) width 165: "This is some column text"
+ RenderBR {BR} at (91,267) size 0x0
+ RenderText {#text} at (91,272) size 169x21
+ text run at (91,272) width 4 RTL: "."
+ text run at (95,272) width 165: "This is some column text"
+ RenderBR {BR} at (91,288) size 0x0
+ RenderText {#text} at (91,293) size 169x21
+ text run at (91,293) width 4 RTL: "."
+ text run at (95,293) width 165: "This is some column text"
+ RenderBR {BR} at (91,309) size 0x0
+ RenderText {#text} at (91,330) size 169x21
+ text run at (91,330) width 4 RTL: "."
+ text run at (95,330) width 165: "This is some column text"
+ RenderBR {BR} at (91,346) size 0x0
diff --git a/LayoutTests/platform/qt/fast/multicol/float-paginate-expected.txt b/LayoutTests/platform/qt/fast/multicol/float-paginate-expected.txt
index 486bb8b..ee410a7 100644
--- a/LayoutTests/platform/qt/fast/multicol/float-paginate-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/float-paginate-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 1188x584
layer at (0,0) size 1188x584
RenderBlock {HTML} at (0,0) size 800x584
RenderBody {BODY} at (8,8) size 784x568
-layer at (8,8) size 1180x512
+layer at (8,8) size 1180x404
RenderBlock {DIV} at (0,0) size 784x404 [border: (2px solid #000000)]
RenderText {#text} at (2,2) size 115x21
text run at (2,2) width 115: "This is some text."
@@ -35,94 +35,94 @@ layer at (8,8) size 1180x512
RenderText {#text} at (2,191) size 115x21
text run at (2,191) width 115: "This is some text."
RenderBR {BR} at (117,207) size 0x0
- RenderImage {IMG} at (2,212) size 250x300 [bgcolor=#008000]
- RenderText {#text} at (252,212) size 115x21
- text run at (252,212) width 115: "This is some text."
- RenderBR {BR} at (367,228) size 0x0
- RenderText {#text} at (252,233) size 115x21
- text run at (252,233) width 115: "This is some text."
- RenderBR {BR} at (367,249) size 0x0
- RenderText {#text} at (252,254) size 115x21
- text run at (252,254) width 115: "This is some text."
- RenderBR {BR} at (367,270) size 0x0
- RenderText {#text} at (252,275) size 115x21
- text run at (252,275) width 115: "This is some text."
- RenderBR {BR} at (367,291) size 0x0
- RenderText {#text} at (252,296) size 115x21
- text run at (252,296) width 115: "This is some text."
- RenderBR {BR} at (367,312) size 0x0
- RenderText {#text} at (252,317) size 115x21
- text run at (252,317) width 115: "This is some text."
- RenderBR {BR} at (367,333) size 0x0
- RenderText {#text} at (252,338) size 115x21
- text run at (252,338) width 115: "This is some text."
- RenderBR {BR} at (367,354) size 0x0
- RenderText {#text} at (252,359) size 115x21
- text run at (252,359) width 115: "This is some text."
- RenderBR {BR} at (367,375) size 0x0
- RenderText {#text} at (252,380) size 115x21
- text run at (252,380) width 115: "This is some text."
- RenderBR {BR} at (367,396) size 0x0
- RenderText {#text} at (252,401) size 115x21
- text run at (252,401) width 115: "This is some text."
- RenderBR {BR} at (367,417) size 0x0
- RenderText {#text} at (252,422) size 115x21
- text run at (252,422) width 115: "This is some text."
- RenderBR {BR} at (367,438) size 0x0
- RenderText {#text} at (252,443) size 115x21
- text run at (252,443) width 115: "This is some text."
- RenderBR {BR} at (367,459) size 0x0
- RenderText {#text} at (252,464) size 115x21
- text run at (252,464) width 115: "This is some text."
- RenderBR {BR} at (367,480) size 0x0
- RenderText {#text} at (252,485) size 115x21
- text run at (252,485) width 115: "This is some text."
- RenderBR {BR} at (367,501) size 0x0
- RenderText {#text} at (252,506) size 115x21
- text run at (252,506) width 115: "This is some text."
- RenderBR {BR} at (367,522) size 0x0
- RenderText {#text} at (2,527) size 115x21
- text run at (2,527) width 115: "This is some text."
- RenderBR {BR} at (117,543) size 0x0
- RenderText {#text} at (2,548) size 115x21
- text run at (2,548) width 115: "This is some text."
- RenderBR {BR} at (117,564) size 0x0
- RenderText {#text} at (2,569) size 115x21
- text run at (2,569) width 115: "This is some text."
- RenderBR {BR} at (117,585) size 0x0
- RenderText {#text} at (2,590) size 115x21
- text run at (2,590) width 115: "This is some text."
- RenderBR {BR} at (117,606) size 0x0
- RenderText {#text} at (2,611) size 115x21
- text run at (2,611) width 115: "This is some text."
- RenderBR {BR} at (117,627) size 0x0
- RenderText {#text} at (2,632) size 115x21
- text run at (2,632) width 115: "This is some text."
- RenderBR {BR} at (117,648) size 0x0
- RenderText {#text} at (2,653) size 115x21
- text run at (2,653) width 115: "This is some text."
- RenderBR {BR} at (117,669) size 0x0
- RenderText {#text} at (2,674) size 115x21
- text run at (2,674) width 115: "This is some text."
- RenderBR {BR} at (117,690) size 0x0
- RenderText {#text} at (2,695) size 115x21
- text run at (2,695) width 115: "This is some text."
- RenderBR {BR} at (117,711) size 0x0
- RenderText {#text} at (2,716) size 115x21
- text run at (2,716) width 115: "This is some text."
- RenderBR {BR} at (117,732) size 0x0
- RenderText {#text} at (2,737) size 115x21
- text run at (2,737) width 115: "This is some text."
- RenderBR {BR} at (117,753) size 0x0
- RenderText {#text} at (2,758) size 115x21
- text run at (2,758) width 115: "This is some text."
- RenderBR {BR} at (117,774) size 0x0
- RenderText {#text} at (2,779) size 115x21
- text run at (2,779) width 115: "This is some text."
- RenderBR {BR} at (117,795) size 0x0
- RenderText {#text} at (2,800) size 115x21
- text run at (2,800) width 115: "This is some text."
- RenderBR {BR} at (117,816) size 0x0
- RenderText {#text} at (2,821) size 115x21
- text run at (2,821) width 115: "This is some text."
- RenderBR {BR} at (117,837) size 0x0
+ RenderImage {IMG} at (2,402) size 250x300 [bgcolor=#008000]
+ RenderText {#text} at (252,402) size 115x21
+ text run at (252,402) width 115: "This is some text."
+ RenderBR {BR} at (367,418) size 0x0
+ RenderText {#text} at (252,423) size 115x21
+ text run at (252,423) width 115: "This is some text."
+ RenderBR {BR} at (367,439) size 0x0
+ RenderText {#text} at (252,444) size 115x21
+ text run at (252,444) width 115: "This is some text."
+ RenderBR {BR} at (367,460) size 0x0
+ RenderText {#text} at (252,465) size 115x21
+ text run at (252,465) width 115: "This is some text."
+ RenderBR {BR} at (367,481) size 0x0
+ RenderText {#text} at (252,486) size 115x21
+ text run at (252,486) width 115: "This is some text."
+ RenderBR {BR} at (367,502) size 0x0
+ RenderText {#text} at (252,507) size 115x21
+ text run at (252,507) width 115: "This is some text."
+ RenderBR {BR} at (367,523) size 0x0
+ RenderText {#text} at (252,528) size 115x21
+ text run at (252,528) width 115: "This is some text."
+ RenderBR {BR} at (367,544) size 0x0
+ RenderText {#text} at (252,549) size 115x21
+ text run at (252,549) width 115: "This is some text."
+ RenderBR {BR} at (367,565) size 0x0
+ RenderText {#text} at (252,570) size 115x21
+ text run at (252,570) width 115: "This is some text."
+ RenderBR {BR} at (367,586) size 0x0
+ RenderText {#text} at (252,591) size 115x21
+ text run at (252,591) width 115: "This is some text."
+ RenderBR {BR} at (367,607) size 0x0
+ RenderText {#text} at (252,612) size 115x21
+ text run at (252,612) width 115: "This is some text."
+ RenderBR {BR} at (367,628) size 0x0
+ RenderText {#text} at (252,633) size 115x21
+ text run at (252,633) width 115: "This is some text."
+ RenderBR {BR} at (367,649) size 0x0
+ RenderText {#text} at (252,654) size 115x21
+ text run at (252,654) width 115: "This is some text."
+ RenderBR {BR} at (367,670) size 0x0
+ RenderText {#text} at (252,675) size 115x21
+ text run at (252,675) width 115: "This is some text."
+ RenderBR {BR} at (367,691) size 0x0
+ RenderText {#text} at (252,696) size 115x21
+ text run at (252,696) width 115: "This is some text."
+ RenderBR {BR} at (367,712) size 0x0
+ RenderText {#text} at (2,717) size 115x21
+ text run at (2,717) width 115: "This is some text."
+ RenderBR {BR} at (117,733) size 0x0
+ RenderText {#text} at (2,738) size 115x21
+ text run at (2,738) width 115: "This is some text."
+ RenderBR {BR} at (117,754) size 0x0
+ RenderText {#text} at (2,759) size 115x21
+ text run at (2,759) width 115: "This is some text."
+ RenderBR {BR} at (117,775) size 0x0
+ RenderText {#text} at (2,780) size 115x21
+ text run at (2,780) width 115: "This is some text."
+ RenderBR {BR} at (117,796) size 0x0
+ RenderText {#text} at (2,802) size 115x21
+ text run at (2,802) width 115: "This is some text."
+ RenderBR {BR} at (117,818) size 0x0
+ RenderText {#text} at (2,823) size 115x21
+ text run at (2,823) width 115: "This is some text."
+ RenderBR {BR} at (117,839) size 0x0
+ RenderText {#text} at (2,844) size 115x21
+ text run at (2,844) width 115: "This is some text."
+ RenderBR {BR} at (117,860) size 0x0
+ RenderText {#text} at (2,865) size 115x21
+ text run at (2,865) width 115: "This is some text."
+ RenderBR {BR} at (117,881) size 0x0
+ RenderText {#text} at (2,886) size 115x21
+ text run at (2,886) width 115: "This is some text."
+ RenderBR {BR} at (117,902) size 0x0
+ RenderText {#text} at (2,907) size 115x21
+ text run at (2,907) width 115: "This is some text."
+ RenderBR {BR} at (117,923) size 0x0
+ RenderText {#text} at (2,928) size 115x21
+ text run at (2,928) width 115: "This is some text."
+ RenderBR {BR} at (117,944) size 0x0
+ RenderText {#text} at (2,949) size 115x21
+ text run at (2,949) width 115: "This is some text."
+ RenderBR {BR} at (117,965) size 0x0
+ RenderText {#text} at (2,970) size 115x21
+ text run at (2,970) width 115: "This is some text."
+ RenderBR {BR} at (117,986) size 0x0
+ RenderText {#text} at (2,991) size 115x21
+ text run at (2,991) width 115: "This is some text."
+ RenderBR {BR} at (117,1007) size 0x0
+ RenderText {#text} at (2,1012) size 115x21
+ text run at (2,1012) width 115: "This is some text."
+ RenderBR {BR} at (117,1028) size 0x0
diff --git a/LayoutTests/platform/qt/fast/multicol/layers-in-multicol-expected.txt b/LayoutTests/platform/qt/fast/multicol/layers-in-multicol-expected.txt
index ea6aedf..658f250 100644
--- a/LayoutTests/platform/qt/fast/multicol/layers-in-multicol-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/layers-in-multicol-expected.txt
@@ -53,58 +53,55 @@ layer at (8,29) size 1279x310
RenderBR {BR} at (111,268) size 0x0
RenderBlock {DIV} at (5,278) size 242x270
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,548) size 242x588
+ RenderBlock (anonymous) at (5,548) size 242x609
RenderText {#text} at (0,0) size 111x21
text run at (0,0) width 111: "This is some text"
RenderBR {BR} at (111,16) size 0x0
RenderText {#text} at (0,21) size 111x21
text run at (0,21) width 111: "This is some text"
RenderBR {BR} at (111,37) size 0x0
- RenderText {#text} at (0,42) size 111x21
- text run at (0,42) width 111: "This is some text"
- RenderBR {BR} at (111,58) size 0x0
- RenderText {#text} at (0,63) size 111x21
- text run at (0,63) width 111: "This is some text"
- RenderBR {BR} at (111,79) size 0x0
- RenderText {#text} at (0,84) size 111x21
- text run at (0,84) width 111: "This is some text"
- RenderBR {BR} at (111,100) size 0x0
- RenderText {#text} at (0,105) size 111x21
- text run at (0,105) width 111: "This is some text"
- RenderBR {BR} at (111,121) size 0x0
- RenderText {#text} at (0,126) size 111x21
- text run at (0,126) width 111: "This is some text"
- RenderBR {BR} at (111,142) size 0x0
- RenderText {#text} at (0,147) size 111x21
- text run at (0,147) width 111: "This is some text"
- RenderBR {BR} at (111,163) size 0x0
- RenderText {#text} at (0,168) size 111x21
- text run at (0,168) width 111: "This is some text"
- RenderBR {BR} at (111,184) size 0x0
- RenderText {#text} at (0,189) size 111x21
- text run at (0,189) width 111: "This is some text"
- RenderBR {BR} at (111,205) size 0x0
- RenderText {#text} at (0,210) size 111x21
- text run at (0,210) width 111: "This is some text"
- RenderBR {BR} at (111,226) size 0x0
- RenderText {#text} at (0,231) size 111x21
- text run at (0,231) width 111: "This is some text"
- RenderBR {BR} at (111,247) size 0x0
- RenderText {#text} at (0,252) size 111x21
- text run at (0,252) width 111: "This is some text"
- RenderBR {BR} at (111,268) size 0x0
- RenderText {#text} at (0,273) size 111x21
- text run at (0,273) width 111: "This is some text"
- RenderBR {BR} at (111,289) size 0x0
- RenderText {#text} at (0,294) size 111x21
- text run at (0,294) width 111: "This is some text"
- RenderBR {BR} at (111,310) size 0x0
- RenderText {#text} at (0,315) size 111x21
- text run at (0,315) width 111: "This is some text"
- RenderBR {BR} at (111,331) size 0x0
- RenderText {#text} at (0,336) size 111x21
- text run at (0,336) width 111: "This is some text"
- RenderBR {BR} at (111,352) size 0x0
+ RenderText {#text} at (0,57) size 111x21
+ text run at (0,57) width 111: "This is some text"
+ RenderBR {BR} at (111,73) size 0x0
+ RenderText {#text} at (0,78) size 111x21
+ text run at (0,78) width 111: "This is some text"
+ RenderBR {BR} at (111,94) size 0x0
+ RenderText {#text} at (0,99) size 111x21
+ text run at (0,99) width 111: "This is some text"
+ RenderBR {BR} at (111,115) size 0x0
+ RenderText {#text} at (0,120) size 111x21
+ text run at (0,120) width 111: "This is some text"
+ RenderBR {BR} at (111,136) size 0x0
+ RenderText {#text} at (0,141) size 111x21
+ text run at (0,141) width 111: "This is some text"
+ RenderBR {BR} at (111,157) size 0x0
+ RenderText {#text} at (0,162) size 111x21
+ text run at (0,162) width 111: "This is some text"
+ RenderBR {BR} at (111,178) size 0x0
+ RenderText {#text} at (0,183) size 111x21
+ text run at (0,183) width 111: "This is some text"
+ RenderBR {BR} at (111,199) size 0x0
+ RenderText {#text} at (0,204) size 111x21
+ text run at (0,204) width 111: "This is some text"
+ RenderBR {BR} at (111,220) size 0x0
+ RenderText {#text} at (0,225) size 111x21
+ text run at (0,225) width 111: "This is some text"
+ RenderBR {BR} at (111,241) size 0x0
+ RenderText {#text} at (0,246) size 111x21
+ text run at (0,246) width 111: "This is some text"
+ RenderBR {BR} at (111,262) size 0x0
+ RenderText {#text} at (0,267) size 111x21
+ text run at (0,267) width 111: "This is some text"
+ RenderBR {BR} at (111,283) size 0x0
+ RenderText {#text} at (0,288) size 111x21
+ text run at (0,288) width 111: "This is some text"
+ RenderBR {BR} at (111,304) size 0x0
+ RenderText {#text} at (0,309) size 111x21
+ text run at (0,309) width 111: "This is some text"
+ RenderBR {BR} at (111,325) size 0x0
+ RenderText {#text} at (0,330) size 111x21
+ text run at (0,330) width 111: "This is some text"
+ RenderBR {BR} at (111,346) size 0x0
RenderText {#text} at (0,357) size 111x21
text run at (0,357) width 111: "This is some text"
RenderBR {BR} at (111,373) size 0x0
@@ -135,50 +132,53 @@ layer at (8,29) size 1279x310
RenderText {#text} at (0,546) size 111x21
text run at (0,546) width 111: "This is some text"
RenderBR {BR} at (111,562) size 0x0
+ RenderText {#text} at (0,567) size 111x21
+ text run at (0,567) width 111: "This is some text"
+ RenderBR {BR} at (111,583) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,1157) size 242x294
+ RenderBlock (anonymous) at (5,1178) size 242x300
RenderText {#text} at (0,0) size 111x21
text run at (0,0) width 111: "This is some text"
RenderBR {BR} at (111,16) size 0x0
- RenderText {#text} at (0,21) size 111x21
- text run at (0,21) width 111: "This is some text"
- RenderBR {BR} at (111,37) size 0x0
- RenderText {#text} at (0,42) size 111x21
- text run at (0,42) width 111: "This is some text"
- RenderBR {BR} at (111,58) size 0x0
- RenderText {#text} at (0,63) size 111x21
- text run at (0,63) width 111: "This is some text"
- RenderBR {BR} at (111,79) size 0x0
- RenderText {#text} at (0,84) size 111x21
- text run at (0,84) width 111: "This is some text"
- RenderBR {BR} at (111,100) size 0x0
- RenderText {#text} at (0,105) size 111x21
- text run at (0,105) width 111: "This is some text"
- RenderBR {BR} at (111,121) size 0x0
- RenderText {#text} at (0,126) size 111x21
- text run at (0,126) width 111: "This is some text"
- RenderBR {BR} at (111,142) size 0x0
- RenderText {#text} at (0,147) size 111x21
- text run at (0,147) width 111: "This is some text"
- RenderBR {BR} at (111,163) size 0x0
- RenderText {#text} at (0,168) size 111x21
- text run at (0,168) width 111: "This is some text"
- RenderBR {BR} at (111,184) size 0x0
- RenderText {#text} at (0,189) size 111x21
- text run at (0,189) width 111: "This is some text"
- RenderBR {BR} at (111,205) size 0x0
- RenderText {#text} at (0,210) size 111x21
- text run at (0,210) width 111: "This is some text"
- RenderBR {BR} at (111,226) size 0x0
- RenderText {#text} at (0,231) size 111x21
- text run at (0,231) width 111: "This is some text"
- RenderBR {BR} at (111,247) size 0x0
- RenderText {#text} at (0,252) size 111x21
- text run at (0,252) width 111: "This is some text"
- RenderBR {BR} at (111,268) size 0x0
- RenderText {#text} at (0,273) size 111x21
- text run at (0,273) width 111: "This is some text"
- RenderBR {BR} at (111,289) size 0x0
+ RenderText {#text} at (0,27) size 111x21
+ text run at (0,27) width 111: "This is some text"
+ RenderBR {BR} at (111,43) size 0x0
+ RenderText {#text} at (0,48) size 111x21
+ text run at (0,48) width 111: "This is some text"
+ RenderBR {BR} at (111,64) size 0x0
+ RenderText {#text} at (0,69) size 111x21
+ text run at (0,69) width 111: "This is some text"
+ RenderBR {BR} at (111,85) size 0x0
+ RenderText {#text} at (0,90) size 111x21
+ text run at (0,90) width 111: "This is some text"
+ RenderBR {BR} at (111,106) size 0x0
+ RenderText {#text} at (0,111) size 111x21
+ text run at (0,111) width 111: "This is some text"
+ RenderBR {BR} at (111,127) size 0x0
+ RenderText {#text} at (0,132) size 111x21
+ text run at (0,132) width 111: "This is some text"
+ RenderBR {BR} at (111,148) size 0x0
+ RenderText {#text} at (0,153) size 111x21
+ text run at (0,153) width 111: "This is some text"
+ RenderBR {BR} at (111,169) size 0x0
+ RenderText {#text} at (0,174) size 111x21
+ text run at (0,174) width 111: "This is some text"
+ RenderBR {BR} at (111,190) size 0x0
+ RenderText {#text} at (0,195) size 111x21
+ text run at (0,195) width 111: "This is some text"
+ RenderBR {BR} at (111,211) size 0x0
+ RenderText {#text} at (0,216) size 111x21
+ text run at (0,216) width 111: "This is some text"
+ RenderBR {BR} at (111,232) size 0x0
+ RenderText {#text} at (0,237) size 111x21
+ text run at (0,237) width 111: "This is some text"
+ RenderBR {BR} at (111,253) size 0x0
+ RenderText {#text} at (0,258) size 111x21
+ text run at (0,258) width 111: "This is some text"
+ RenderBR {BR} at (111,274) size 0x0
+ RenderText {#text} at (0,279) size 111x21
+ text run at (0,279) width 111: "This is some text"
+ RenderBR {BR} at (111,295) size 0x0
layer at (8,360) size 768x310
RenderBlock {DIV} at (0,352) size 768x310 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 242x273
@@ -223,58 +223,55 @@ layer at (8,360) size 768x310
RenderBR {BR} at (131,268) size 0x0
RenderBlock {DIV} at (5,278) size 242x270
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,548) size 242x588
+ RenderBlock (anonymous) at (5,548) size 242x609
RenderText {#text} at (131,0) size 111x21
text run at (131,0) width 111: "This is some text"
RenderBR {BR} at (131,16) size 0x0
RenderText {#text} at (131,21) size 111x21
text run at (131,21) width 111: "This is some text"
RenderBR {BR} at (131,37) size 0x0
- RenderText {#text} at (131,42) size 111x21
- text run at (131,42) width 111: "This is some text"
- RenderBR {BR} at (131,58) size 0x0
- RenderText {#text} at (131,63) size 111x21
- text run at (131,63) width 111: "This is some text"
- RenderBR {BR} at (131,79) size 0x0
- RenderText {#text} at (131,84) size 111x21
- text run at (131,84) width 111: "This is some text"
- RenderBR {BR} at (131,100) size 0x0
- RenderText {#text} at (131,105) size 111x21
- text run at (131,105) width 111: "This is some text"
- RenderBR {BR} at (131,121) size 0x0
- RenderText {#text} at (131,126) size 111x21
- text run at (131,126) width 111: "This is some text"
- RenderBR {BR} at (131,142) size 0x0
- RenderText {#text} at (131,147) size 111x21
- text run at (131,147) width 111: "This is some text"
- RenderBR {BR} at (131,163) size 0x0
- RenderText {#text} at (131,168) size 111x21
- text run at (131,168) width 111: "This is some text"
- RenderBR {BR} at (131,184) size 0x0
- RenderText {#text} at (131,189) size 111x21
- text run at (131,189) width 111: "This is some text"
- RenderBR {BR} at (131,205) size 0x0
- RenderText {#text} at (131,210) size 111x21
- text run at (131,210) width 111: "This is some text"
- RenderBR {BR} at (131,226) size 0x0
- RenderText {#text} at (131,231) size 111x21
- text run at (131,231) width 111: "This is some text"
- RenderBR {BR} at (131,247) size 0x0
- RenderText {#text} at (131,252) size 111x21
- text run at (131,252) width 111: "This is some text"
- RenderBR {BR} at (131,268) size 0x0
- RenderText {#text} at (131,273) size 111x21
- text run at (131,273) width 111: "This is some text"
- RenderBR {BR} at (131,289) size 0x0
- RenderText {#text} at (131,294) size 111x21
- text run at (131,294) width 111: "This is some text"
- RenderBR {BR} at (131,310) size 0x0
- RenderText {#text} at (131,315) size 111x21
- text run at (131,315) width 111: "This is some text"
- RenderBR {BR} at (131,331) size 0x0
- RenderText {#text} at (131,336) size 111x21
- text run at (131,336) width 111: "This is some text"
- RenderBR {BR} at (131,352) size 0x0
+ RenderText {#text} at (131,57) size 111x21
+ text run at (131,57) width 111: "This is some text"
+ RenderBR {BR} at (131,73) size 0x0
+ RenderText {#text} at (131,78) size 111x21
+ text run at (131,78) width 111: "This is some text"
+ RenderBR {BR} at (131,94) size 0x0
+ RenderText {#text} at (131,99) size 111x21
+ text run at (131,99) width 111: "This is some text"
+ RenderBR {BR} at (131,115) size 0x0
+ RenderText {#text} at (131,120) size 111x21
+ text run at (131,120) width 111: "This is some text"
+ RenderBR {BR} at (131,136) size 0x0
+ RenderText {#text} at (131,141) size 111x21
+ text run at (131,141) width 111: "This is some text"
+ RenderBR {BR} at (131,157) size 0x0
+ RenderText {#text} at (131,162) size 111x21
+ text run at (131,162) width 111: "This is some text"
+ RenderBR {BR} at (131,178) size 0x0
+ RenderText {#text} at (131,183) size 111x21
+ text run at (131,183) width 111: "This is some text"
+ RenderBR {BR} at (131,199) size 0x0
+ RenderText {#text} at (131,204) size 111x21
+ text run at (131,204) width 111: "This is some text"
+ RenderBR {BR} at (131,220) size 0x0
+ RenderText {#text} at (131,225) size 111x21
+ text run at (131,225) width 111: "This is some text"
+ RenderBR {BR} at (131,241) size 0x0
+ RenderText {#text} at (131,246) size 111x21
+ text run at (131,246) width 111: "This is some text"
+ RenderBR {BR} at (131,262) size 0x0
+ RenderText {#text} at (131,267) size 111x21
+ text run at (131,267) width 111: "This is some text"
+ RenderBR {BR} at (131,283) size 0x0
+ RenderText {#text} at (131,288) size 111x21
+ text run at (131,288) width 111: "This is some text"
+ RenderBR {BR} at (131,304) size 0x0
+ RenderText {#text} at (131,309) size 111x21
+ text run at (131,309) width 111: "This is some text"
+ RenderBR {BR} at (131,325) size 0x0
+ RenderText {#text} at (131,330) size 111x21
+ text run at (131,330) width 111: "This is some text"
+ RenderBR {BR} at (131,346) size 0x0
RenderText {#text} at (131,357) size 111x21
text run at (131,357) width 111: "This is some text"
RenderBR {BR} at (131,373) size 0x0
@@ -305,50 +302,53 @@ layer at (8,360) size 768x310
RenderText {#text} at (131,546) size 111x21
text run at (131,546) width 111: "This is some text"
RenderBR {BR} at (131,562) size 0x0
+ RenderText {#text} at (131,567) size 111x21
+ text run at (131,567) width 111: "This is some text"
+ RenderBR {BR} at (131,583) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,1157) size 242x294
+ RenderBlock (anonymous) at (5,1178) size 242x300
RenderText {#text} at (131,0) size 111x21
text run at (131,0) width 111: "This is some text"
RenderBR {BR} at (131,16) size 0x0
- RenderText {#text} at (131,21) size 111x21
- text run at (131,21) width 111: "This is some text"
- RenderBR {BR} at (131,37) size 0x0
- RenderText {#text} at (131,42) size 111x21
- text run at (131,42) width 111: "This is some text"
- RenderBR {BR} at (131,58) size 0x0
- RenderText {#text} at (131,63) size 111x21
- text run at (131,63) width 111: "This is some text"
- RenderBR {BR} at (131,79) size 0x0
- RenderText {#text} at (131,84) size 111x21
- text run at (131,84) width 111: "This is some text"
- RenderBR {BR} at (131,100) size 0x0
- RenderText {#text} at (131,105) size 111x21
- text run at (131,105) width 111: "This is some text"
- RenderBR {BR} at (131,121) size 0x0
- RenderText {#text} at (131,126) size 111x21
- text run at (131,126) width 111: "This is some text"
- RenderBR {BR} at (131,142) size 0x0
- RenderText {#text} at (131,147) size 111x21
- text run at (131,147) width 111: "This is some text"
- RenderBR {BR} at (131,163) size 0x0
- RenderText {#text} at (131,168) size 111x21
- text run at (131,168) width 111: "This is some text"
- RenderBR {BR} at (131,184) size 0x0
- RenderText {#text} at (131,189) size 111x21
- text run at (131,189) width 111: "This is some text"
- RenderBR {BR} at (131,205) size 0x0
- RenderText {#text} at (131,210) size 111x21
- text run at (131,210) width 111: "This is some text"
- RenderBR {BR} at (131,226) size 0x0
- RenderText {#text} at (131,231) size 111x21
- text run at (131,231) width 111: "This is some text"
- RenderBR {BR} at (131,247) size 0x0
- RenderText {#text} at (131,252) size 111x21
- text run at (131,252) width 111: "This is some text"
- RenderBR {BR} at (131,268) size 0x0
- RenderText {#text} at (131,273) size 111x21
- text run at (131,273) width 111: "This is some text"
- RenderBR {BR} at (131,289) size 0x0
+ RenderText {#text} at (131,27) size 111x21
+ text run at (131,27) width 111: "This is some text"
+ RenderBR {BR} at (131,43) size 0x0
+ RenderText {#text} at (131,48) size 111x21
+ text run at (131,48) width 111: "This is some text"
+ RenderBR {BR} at (131,64) size 0x0
+ RenderText {#text} at (131,69) size 111x21
+ text run at (131,69) width 111: "This is some text"
+ RenderBR {BR} at (131,85) size 0x0
+ RenderText {#text} at (131,90) size 111x21
+ text run at (131,90) width 111: "This is some text"
+ RenderBR {BR} at (131,106) size 0x0
+ RenderText {#text} at (131,111) size 111x21
+ text run at (131,111) width 111: "This is some text"
+ RenderBR {BR} at (131,127) size 0x0
+ RenderText {#text} at (131,132) size 111x21
+ text run at (131,132) width 111: "This is some text"
+ RenderBR {BR} at (131,148) size 0x0
+ RenderText {#text} at (131,153) size 111x21
+ text run at (131,153) width 111: "This is some text"
+ RenderBR {BR} at (131,169) size 0x0
+ RenderText {#text} at (131,174) size 111x21
+ text run at (131,174) width 111: "This is some text"
+ RenderBR {BR} at (131,190) size 0x0
+ RenderText {#text} at (131,195) size 111x21
+ text run at (131,195) width 111: "This is some text"
+ RenderBR {BR} at (131,211) size 0x0
+ RenderText {#text} at (131,216) size 111x21
+ text run at (131,216) width 111: "This is some text"
+ RenderBR {BR} at (131,232) size 0x0
+ RenderText {#text} at (131,237) size 111x21
+ text run at (131,237) width 111: "This is some text"
+ RenderBR {BR} at (131,253) size 0x0
+ RenderText {#text} at (131,258) size 111x21
+ text run at (131,258) width 111: "This is some text"
+ RenderBR {BR} at (131,274) size 0x0
+ RenderText {#text} at (131,279) size 111x21
+ text run at (131,279) width 111: "This is some text"
+ RenderBR {BR} at (131,295) size 0x0
layer at (13,307) size 100x270
RenderBlock (relative positioned) {DIV} at (0,0) size 100x270 [bgcolor=#008000]
layer at (155,638) size 100x270 backgroundClip at (0,0) size 1287x678 clip at (0,0) size 1287x678 outlineClip at (0,0) size 1287x678
diff --git a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt
index b1da79f..91e6784 100644
--- a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt
@@ -24,27 +24,27 @@ layer at (8,8) size 1133x500
RenderBlock {H1} at (0,336) size 367x42
RenderText {#text} at (0,0) size 169x41
text run at (0,0) width 169: "Header Two"
- RenderBlock (anonymous) at (0,399) size 367x252
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock (anonymous) at (0,399) size 367x269
+ RenderText {#text} at (0,0) size 367x269
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {H1} at (0,672) size 367x42
+ text run at (0,101) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,122) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,143) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,164) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,185) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,206) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,227) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,248) width 184: "consectetuer adipiscing elit."
+ RenderBlock {H1} at (0,689) size 367x42
RenderText {#text} at (0,0) size 190x41
text run at (0,0) width 190: "Header Three"
- RenderBlock {H1} at (0,1029) size 367x42
+ RenderBlock {H1} at (0,1046) size 367x42
RenderText {#text} at (0,0) size 177x41
text run at (0,0) width 177: "Header Four"
- RenderBlock (anonymous) at (0,1092) size 367x42
+ RenderBlock (anonymous) at (0,1109) size 367x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
diff --git a/LayoutTests/platform/qt/fast/multicol/paginate-block-replaced-expected.txt b/LayoutTests/platform/qt/fast/multicol/paginate-block-replaced-expected.txt
index b9eb361..be4afda 100644
--- a/LayoutTests/platform/qt/fast/multicol/paginate-block-replaced-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/paginate-block-replaced-expected.txt
@@ -36,8 +36,8 @@ layer at (8,8) size 1578x404
RenderText {#text} at (0,189) size 115x21
text run at (0,189) width 115: "This is some text."
RenderBR {BR} at (115,205) size 0x0
- RenderImage {IMG} at (2,212) size 250x300 [bgcolor=#008000]
- RenderBlock (anonymous) at (2,512) size 382x630
+ RenderImage {IMG} at (2,402) size 250x300 [bgcolor=#008000]
+ RenderBlock (anonymous) at (2,702) size 382x647
RenderText {#text} at (0,0) size 115x21
text run at (0,0) width 115: "This is some text."
RenderBR {BR} at (115,16) size 0x0
@@ -50,81 +50,81 @@ layer at (8,8) size 1578x404
RenderText {#text} at (0,63) size 115x21
text run at (0,63) width 115: "This is some text."
RenderBR {BR} at (115,79) size 0x0
- RenderText {#text} at (0,84) size 115x21
- text run at (0,84) width 115: "This is some text."
- RenderBR {BR} at (115,100) size 0x0
- RenderText {#text} at (0,105) size 115x21
- text run at (0,105) width 115: "This is some text."
- RenderBR {BR} at (115,121) size 0x0
- RenderText {#text} at (0,126) size 115x21
- text run at (0,126) width 115: "This is some text."
- RenderBR {BR} at (115,142) size 0x0
- RenderText {#text} at (0,147) size 115x21
- text run at (0,147) width 115: "This is some text."
- RenderBR {BR} at (115,163) size 0x0
- RenderText {#text} at (0,168) size 115x21
- text run at (0,168) width 115: "This is some text."
- RenderBR {BR} at (115,184) size 0x0
- RenderText {#text} at (0,189) size 115x21
- text run at (0,189) width 115: "This is some text."
- RenderBR {BR} at (115,205) size 0x0
- RenderText {#text} at (0,210) size 115x21
- text run at (0,210) width 115: "This is some text."
- RenderBR {BR} at (115,226) size 0x0
- RenderText {#text} at (0,231) size 115x21
- text run at (0,231) width 115: "This is some text."
- RenderBR {BR} at (115,247) size 0x0
- RenderText {#text} at (0,252) size 115x21
- text run at (0,252) width 115: "This is some text."
- RenderBR {BR} at (115,268) size 0x0
- RenderText {#text} at (0,273) size 115x21
- text run at (0,273) width 115: "This is some text."
- RenderBR {BR} at (115,289) size 0x0
- RenderText {#text} at (0,294) size 115x21
- text run at (0,294) width 115: "This is some text."
- RenderBR {BR} at (115,310) size 0x0
- RenderText {#text} at (0,315) size 115x21
- text run at (0,315) width 115: "This is some text."
- RenderBR {BR} at (115,331) size 0x0
- RenderText {#text} at (0,336) size 115x21
- text run at (0,336) width 115: "This is some text."
- RenderBR {BR} at (115,352) size 0x0
- RenderText {#text} at (0,357) size 115x21
- text run at (0,357) width 115: "This is some text."
- RenderBR {BR} at (115,373) size 0x0
- RenderText {#text} at (0,378) size 115x21
- text run at (0,378) width 115: "This is some text."
- RenderBR {BR} at (115,394) size 0x0
- RenderText {#text} at (0,399) size 115x21
- text run at (0,399) width 115: "This is some text."
- RenderBR {BR} at (115,415) size 0x0
- RenderText {#text} at (0,420) size 115x21
- text run at (0,420) width 115: "This is some text."
- RenderBR {BR} at (115,436) size 0x0
- RenderText {#text} at (0,441) size 115x21
- text run at (0,441) width 115: "This is some text."
- RenderBR {BR} at (115,457) size 0x0
- RenderText {#text} at (0,462) size 115x21
- text run at (0,462) width 115: "This is some text."
- RenderBR {BR} at (115,478) size 0x0
- RenderText {#text} at (0,483) size 115x21
- text run at (0,483) width 115: "This is some text."
- RenderBR {BR} at (115,499) size 0x0
- RenderText {#text} at (0,504) size 115x21
- text run at (0,504) width 115: "This is some text."
- RenderBR {BR} at (115,520) size 0x0
- RenderText {#text} at (0,525) size 115x21
- text run at (0,525) width 115: "This is some text."
- RenderBR {BR} at (115,541) size 0x0
- RenderText {#text} at (0,546) size 115x21
- text run at (0,546) width 115: "This is some text."
- RenderBR {BR} at (115,562) size 0x0
- RenderText {#text} at (0,567) size 115x21
- text run at (0,567) width 115: "This is some text."
- RenderBR {BR} at (115,583) size 0x0
- RenderText {#text} at (0,588) size 115x21
- text run at (0,588) width 115: "This is some text."
- RenderBR {BR} at (115,604) size 0x0
- RenderText {#text} at (0,609) size 115x21
- text run at (0,609) width 115: "This is some text."
- RenderBR {BR} at (115,625) size 0x0
+ RenderText {#text} at (0,100) size 115x21
+ text run at (0,100) width 115: "This is some text."
+ RenderBR {BR} at (115,116) size 0x0
+ RenderText {#text} at (0,121) size 115x21
+ text run at (0,121) width 115: "This is some text."
+ RenderBR {BR} at (115,137) size 0x0
+ RenderText {#text} at (0,142) size 115x21
+ text run at (0,142) width 115: "This is some text."
+ RenderBR {BR} at (115,158) size 0x0
+ RenderText {#text} at (0,163) size 115x21
+ text run at (0,163) width 115: "This is some text."
+ RenderBR {BR} at (115,179) size 0x0
+ RenderText {#text} at (0,184) size 115x21
+ text run at (0,184) width 115: "This is some text."
+ RenderBR {BR} at (115,200) size 0x0
+ RenderText {#text} at (0,205) size 115x21
+ text run at (0,205) width 115: "This is some text."
+ RenderBR {BR} at (115,221) size 0x0
+ RenderText {#text} at (0,226) size 115x21
+ text run at (0,226) width 115: "This is some text."
+ RenderBR {BR} at (115,242) size 0x0
+ RenderText {#text} at (0,247) size 115x21
+ text run at (0,247) width 115: "This is some text."
+ RenderBR {BR} at (115,263) size 0x0
+ RenderText {#text} at (0,268) size 115x21
+ text run at (0,268) width 115: "This is some text."
+ RenderBR {BR} at (115,284) size 0x0
+ RenderText {#text} at (0,289) size 115x21
+ text run at (0,289) width 115: "This is some text."
+ RenderBR {BR} at (115,305) size 0x0
+ RenderText {#text} at (0,310) size 115x21
+ text run at (0,310) width 115: "This is some text."
+ RenderBR {BR} at (115,326) size 0x0
+ RenderText {#text} at (0,331) size 115x21
+ text run at (0,331) width 115: "This is some text."
+ RenderBR {BR} at (115,347) size 0x0
+ RenderText {#text} at (0,352) size 115x21
+ text run at (0,352) width 115: "This is some text."
+ RenderBR {BR} at (115,368) size 0x0
+ RenderText {#text} at (0,373) size 115x21
+ text run at (0,373) width 115: "This is some text."
+ RenderBR {BR} at (115,389) size 0x0
+ RenderText {#text} at (0,394) size 115x21
+ text run at (0,394) width 115: "This is some text."
+ RenderBR {BR} at (115,410) size 0x0
+ RenderText {#text} at (0,415) size 115x21
+ text run at (0,415) width 115: "This is some text."
+ RenderBR {BR} at (115,431) size 0x0
+ RenderText {#text} at (0,436) size 115x21
+ text run at (0,436) width 115: "This is some text."
+ RenderBR {BR} at (115,452) size 0x0
+ RenderText {#text} at (0,457) size 115x21
+ text run at (0,457) width 115: "This is some text."
+ RenderBR {BR} at (115,473) size 0x0
+ RenderText {#text} at (0,478) size 115x21
+ text run at (0,478) width 115: "This is some text."
+ RenderBR {BR} at (115,494) size 0x0
+ RenderText {#text} at (0,500) size 115x21
+ text run at (0,500) width 115: "This is some text."
+ RenderBR {BR} at (115,516) size 0x0
+ RenderText {#text} at (0,521) size 115x21
+ text run at (0,521) width 115: "This is some text."
+ RenderBR {BR} at (115,537) size 0x0
+ RenderText {#text} at (0,542) size 115x21
+ text run at (0,542) width 115: "This is some text."
+ RenderBR {BR} at (115,558) size 0x0
+ RenderText {#text} at (0,563) size 115x21
+ text run at (0,563) width 115: "This is some text."
+ RenderBR {BR} at (115,579) size 0x0
+ RenderText {#text} at (0,584) size 115x21
+ text run at (0,584) width 115: "This is some text."
+ RenderBR {BR} at (115,600) size 0x0
+ RenderText {#text} at (0,605) size 115x21
+ text run at (0,605) width 115: "This is some text."
+ RenderBR {BR} at (115,621) size 0x0
+ RenderText {#text} at (0,626) size 115x21
+ text run at (0,626) width 115: "This is some text."
+ RenderBR {BR} at (115,642) size 0x0
diff --git a/LayoutTests/platform/qt/fast/multicol/positioned-with-constrained-height-expected.txt b/LayoutTests/platform/qt/fast/multicol/positioned-with-constrained-height-expected.txt
index adad247..5cb3866 100644
--- a/LayoutTests/platform/qt/fast/multicol/positioned-with-constrained-height-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/positioned-with-constrained-height-expected.txt
@@ -47,264 +47,258 @@ layer at (8,8) size 1254x300
RenderText {#text} at (0,273) size 111x21
text run at (0,273) width 111: "This is some text"
RenderBR {BR} at (111,289) size 0x0
- RenderText {#text} at (0,294) size 111x21
- text run at (0,294) width 111: "This is some text"
- RenderBR {BR} at (111,310) size 0x0
- RenderText {#text} at (0,315) size 111x21
- text run at (0,315) width 111: "This is some text"
- RenderBR {BR} at (111,331) size 0x0
- RenderText {#text} at (0,336) size 111x21
- text run at (0,336) width 111: "This is some text"
- RenderBR {BR} at (111,352) size 0x0
- RenderText {#text} at (0,357) size 111x21
- text run at (0,357) width 111: "This is some text"
- RenderBR {BR} at (111,373) size 0x0
- RenderText {#text} at (0,378) size 111x21
- text run at (0,378) width 111: "This is some text"
- RenderBR {BR} at (111,394) size 0x0
- RenderText {#text} at (0,399) size 111x21
- text run at (0,399) width 111: "This is some text"
- RenderBR {BR} at (111,415) size 0x0
- RenderText {#text} at (0,420) size 111x21
- text run at (0,420) width 111: "This is some text"
- RenderBR {BR} at (111,436) size 0x0
- RenderText {#text} at (0,441) size 111x21
- text run at (0,441) width 111: "This is some text"
- RenderBR {BR} at (111,457) size 0x0
- RenderText {#text} at (0,462) size 111x21
- text run at (0,462) width 111: "This is some text"
- RenderBR {BR} at (111,478) size 0x0
- RenderText {#text} at (0,483) size 111x21
- text run at (0,483) width 111: "This is some text"
- RenderBR {BR} at (111,499) size 0x0
- RenderText {#text} at (0,504) size 111x21
- text run at (0,504) width 111: "This is some text"
- RenderBR {BR} at (111,520) size 0x0
- RenderText {#text} at (0,525) size 111x21
- text run at (0,525) width 111: "This is some text"
- RenderBR {BR} at (111,541) size 0x0
- RenderText {#text} at (0,546) size 111x21
- text run at (0,546) width 111: "This is some text"
- RenderBR {BR} at (111,562) size 0x0
- RenderText {#text} at (0,567) size 111x21
- text run at (0,567) width 111: "This is some text"
- RenderBR {BR} at (111,583) size 0x0
- RenderText {#text} at (0,588) size 111x21
- text run at (0,588) width 111: "This is some text"
- RenderBR {BR} at (111,604) size 0x0
- RenderText {#text} at (0,609) size 111x21
- text run at (0,609) width 111: "This is some text"
- RenderBR {BR} at (111,625) size 0x0
- RenderText {#text} at (0,630) size 111x21
- text run at (0,630) width 111: "This is some text"
- RenderBR {BR} at (111,646) size 0x0
- RenderText {#text} at (0,651) size 111x21
- text run at (0,651) width 111: "This is some text"
- RenderBR {BR} at (111,667) size 0x0
- RenderText {#text} at (0,672) size 111x21
- text run at (0,672) width 111: "This is some text"
- RenderBR {BR} at (111,688) size 0x0
- RenderText {#text} at (0,693) size 111x21
- text run at (0,693) width 111: "This is some text"
- RenderBR {BR} at (111,709) size 0x0
- RenderText {#text} at (0,714) size 111x21
- text run at (0,714) width 111: "This is some text"
- RenderBR {BR} at (111,730) size 0x0
- RenderText {#text} at (0,735) size 111x21
- text run at (0,735) width 111: "This is some text"
- RenderBR {BR} at (111,751) size 0x0
- RenderText {#text} at (0,756) size 111x21
- text run at (0,756) width 111: "This is some text"
- RenderBR {BR} at (111,772) size 0x0
- RenderText {#text} at (0,777) size 111x21
- text run at (0,777) width 111: "This is some text"
- RenderBR {BR} at (111,793) size 0x0
- RenderText {#text} at (0,798) size 111x21
- text run at (0,798) width 111: "This is some text"
- RenderBR {BR} at (111,814) size 0x0
- RenderText {#text} at (0,819) size 111x21
- text run at (0,819) width 111: "This is some text"
- RenderBR {BR} at (111,835) size 0x0
- RenderText {#text} at (0,840) size 111x21
- text run at (0,840) width 111: "This is some text"
- RenderBR {BR} at (111,856) size 0x0
- RenderText {#text} at (0,861) size 111x21
- text run at (0,861) width 111: "This is some text"
- RenderBR {BR} at (111,877) size 0x0
- RenderText {#text} at (0,882) size 111x21
- text run at (0,882) width 111: "This is some text"
- RenderBR {BR} at (111,898) size 0x0
- RenderText {#text} at (0,903) size 111x21
- text run at (0,903) width 111: "This is some text"
- RenderBR {BR} at (111,919) size 0x0
- RenderText {#text} at (0,924) size 111x21
- text run at (0,924) width 111: "This is some text"
- RenderBR {BR} at (111,940) size 0x0
- RenderText {#text} at (0,945) size 111x21
- text run at (0,945) width 111: "This is some text"
- RenderBR {BR} at (111,961) size 0x0
- RenderText {#text} at (0,966) size 111x21
- text run at (0,966) width 111: "This is some text"
- RenderBR {BR} at (111,982) size 0x0
- RenderText {#text} at (0,987) size 111x21
- text run at (0,987) width 111: "This is some text"
- RenderBR {BR} at (111,1003) size 0x0
- RenderText {#text} at (0,1008) size 111x21
- text run at (0,1008) width 111: "This is some text"
- RenderBR {BR} at (111,1024) size 0x0
- RenderText {#text} at (0,1029) size 111x21
- text run at (0,1029) width 111: "This is some text"
- RenderBR {BR} at (111,1045) size 0x0
- RenderText {#text} at (0,1050) size 111x21
- text run at (0,1050) width 111: "This is some text"
- RenderBR {BR} at (111,1066) size 0x0
- RenderText {#text} at (0,1071) size 111x21
- text run at (0,1071) width 111: "This is some text"
- RenderBR {BR} at (111,1087) size 0x0
- RenderText {#text} at (0,1092) size 111x21
- text run at (0,1092) width 111: "This is some text"
- RenderBR {BR} at (111,1108) size 0x0
- RenderText {#text} at (0,1113) size 111x21
- text run at (0,1113) width 111: "This is some text"
- RenderBR {BR} at (111,1129) size 0x0
- RenderText {#text} at (0,1134) size 111x21
- text run at (0,1134) width 111: "This is some text"
- RenderBR {BR} at (111,1150) size 0x0
- RenderText {#text} at (0,1155) size 111x21
- text run at (0,1155) width 111: "This is some text"
- RenderBR {BR} at (111,1171) size 0x0
- RenderText {#text} at (0,1176) size 111x21
- text run at (0,1176) width 111: "This is some text"
- RenderBR {BR} at (111,1192) size 0x0
- RenderText {#text} at (0,1197) size 111x21
- text run at (0,1197) width 111: "This is some text"
- RenderBR {BR} at (111,1213) size 0x0
- RenderText {#text} at (0,1218) size 111x21
- text run at (0,1218) width 111: "This is some text"
- RenderBR {BR} at (111,1234) size 0x0
- RenderText {#text} at (0,1239) size 111x21
- text run at (0,1239) width 111: "This is some text"
- RenderBR {BR} at (111,1255) size 0x0
- RenderText {#text} at (0,1260) size 111x21
- text run at (0,1260) width 111: "This is some text"
- RenderBR {BR} at (111,1276) size 0x0
- RenderText {#text} at (0,1281) size 111x21
- text run at (0,1281) width 111: "This is some text"
- RenderBR {BR} at (111,1297) size 0x0
- RenderText {#text} at (0,1302) size 111x21
- text run at (0,1302) width 111: "This is some text"
- RenderBR {BR} at (111,1318) size 0x0
- RenderText {#text} at (0,1323) size 111x21
- text run at (0,1323) width 111: "This is some text"
- RenderBR {BR} at (111,1339) size 0x0
- RenderText {#text} at (0,1344) size 111x21
- text run at (0,1344) width 111: "This is some text"
- RenderBR {BR} at (111,1360) size 0x0
- RenderText {#text} at (0,1365) size 111x21
- text run at (0,1365) width 111: "This is some text"
- RenderBR {BR} at (111,1381) size 0x0
- RenderText {#text} at (0,1386) size 111x21
- text run at (0,1386) width 111: "This is some text"
- RenderBR {BR} at (111,1402) size 0x0
- RenderText {#text} at (0,1407) size 111x21
- text run at (0,1407) width 111: "This is some text"
- RenderBR {BR} at (111,1423) size 0x0
- RenderText {#text} at (0,1428) size 111x21
- text run at (0,1428) width 111: "This is some text"
- RenderBR {BR} at (111,1444) size 0x0
- RenderText {#text} at (0,1449) size 111x21
- text run at (0,1449) width 111: "This is some text"
- RenderBR {BR} at (111,1465) size 0x0
- RenderText {#text} at (0,1470) size 111x21
- text run at (0,1470) width 111: "This is some text"
- RenderBR {BR} at (111,1486) size 0x0
- RenderText {#text} at (0,1491) size 111x21
- text run at (0,1491) width 111: "This is some text"
- RenderBR {BR} at (111,1507) size 0x0
- RenderText {#text} at (0,1512) size 111x21
- text run at (0,1512) width 111: "This is some text"
- RenderBR {BR} at (111,1528) size 0x0
- RenderText {#text} at (0,1533) size 111x21
- text run at (0,1533) width 111: "This is some text"
- RenderBR {BR} at (111,1549) size 0x0
- RenderText {#text} at (0,1554) size 111x21
- text run at (0,1554) width 111: "This is some text"
- RenderBR {BR} at (111,1570) size 0x0
- RenderText {#text} at (0,1575) size 111x21
- text run at (0,1575) width 111: "This is some text"
- RenderBR {BR} at (111,1591) size 0x0
- RenderText {#text} at (0,1596) size 111x21
- text run at (0,1596) width 111: "This is some text"
- RenderBR {BR} at (111,1612) size 0x0
- RenderText {#text} at (0,1617) size 111x21
- text run at (0,1617) width 111: "This is some text"
- RenderBR {BR} at (111,1633) size 0x0
- RenderText {#text} at (0,1638) size 111x21
- text run at (0,1638) width 111: "This is some text"
- RenderBR {BR} at (111,1654) size 0x0
- RenderText {#text} at (0,1659) size 111x21
- text run at (0,1659) width 111: "This is some text"
- RenderBR {BR} at (111,1675) size 0x0
- RenderText {#text} at (0,1680) size 111x21
- text run at (0,1680) width 111: "This is some text"
- RenderBR {BR} at (111,1696) size 0x0
- RenderText {#text} at (0,1701) size 111x21
- text run at (0,1701) width 111: "This is some text"
- RenderBR {BR} at (111,1717) size 0x0
- RenderText {#text} at (0,1722) size 111x21
- text run at (0,1722) width 111: "This is some text"
- RenderBR {BR} at (111,1738) size 0x0
- RenderText {#text} at (0,1743) size 111x21
- text run at (0,1743) width 111: "This is some text"
- RenderBR {BR} at (111,1759) size 0x0
- RenderText {#text} at (0,1764) size 111x21
- text run at (0,1764) width 111: "This is some text"
- RenderBR {BR} at (111,1780) size 0x0
- RenderText {#text} at (0,1785) size 111x21
- text run at (0,1785) width 111: "This is some text"
- RenderBR {BR} at (111,1801) size 0x0
- RenderText {#text} at (0,1806) size 111x21
- text run at (0,1806) width 111: "This is some text"
- RenderBR {BR} at (111,1822) size 0x0
- RenderText {#text} at (0,1827) size 111x21
- text run at (0,1827) width 111: "This is some text"
- RenderBR {BR} at (111,1843) size 0x0
- RenderText {#text} at (0,1848) size 111x21
- text run at (0,1848) width 111: "This is some text"
- RenderBR {BR} at (111,1864) size 0x0
- RenderText {#text} at (0,1869) size 111x21
- text run at (0,1869) width 111: "This is some text"
- RenderBR {BR} at (111,1885) size 0x0
- RenderText {#text} at (0,1890) size 111x21
- text run at (0,1890) width 111: "This is some text"
- RenderBR {BR} at (111,1906) size 0x0
- RenderText {#text} at (0,1911) size 111x21
- text run at (0,1911) width 111: "This is some text"
- RenderBR {BR} at (111,1927) size 0x0
- RenderText {#text} at (0,1932) size 111x21
- text run at (0,1932) width 111: "This is some text"
- RenderBR {BR} at (111,1948) size 0x0
- RenderText {#text} at (0,1953) size 111x21
- text run at (0,1953) width 111: "This is some text"
- RenderBR {BR} at (111,1969) size 0x0
- RenderText {#text} at (0,1974) size 111x21
- text run at (0,1974) width 111: "This is some text"
- RenderBR {BR} at (111,1990) size 0x0
- RenderText {#text} at (0,1995) size 111x21
- text run at (0,1995) width 111: "This is some text"
- RenderBR {BR} at (111,2011) size 0x0
- RenderText {#text} at (0,2016) size 111x21
- text run at (0,2016) width 111: "This is some text"
- RenderBR {BR} at (111,2032) size 0x0
- RenderText {#text} at (0,2037) size 111x21
- text run at (0,2037) width 111: "This is some text"
- RenderBR {BR} at (111,2053) size 0x0
- RenderText {#text} at (0,2058) size 111x21
- text run at (0,2058) width 111: "This is some text"
- RenderBR {BR} at (111,2074) size 0x0
- RenderText {#text} at (0,2079) size 111x21
- text run at (0,2079) width 111: "This is some text"
- RenderBR {BR} at (111,2095) size 0x0
+ RenderText {#text} at (0,300) size 111x21
+ text run at (0,300) width 111: "This is some text"
+ RenderBR {BR} at (111,316) size 0x0
+ RenderText {#text} at (0,321) size 111x21
+ text run at (0,321) width 111: "This is some text"
+ RenderBR {BR} at (111,337) size 0x0
+ RenderText {#text} at (0,342) size 111x21
+ text run at (0,342) width 111: "This is some text"
+ RenderBR {BR} at (111,358) size 0x0
+ RenderText {#text} at (0,363) size 111x21
+ text run at (0,363) width 111: "This is some text"
+ RenderBR {BR} at (111,379) size 0x0
+ RenderText {#text} at (0,384) size 111x21
+ text run at (0,384) width 111: "This is some text"
+ RenderBR {BR} at (111,400) size 0x0
+ RenderText {#text} at (0,405) size 111x21
+ text run at (0,405) width 111: "This is some text"
+ RenderBR {BR} at (111,421) size 0x0
+ RenderText {#text} at (0,426) size 111x21
+ text run at (0,426) width 111: "This is some text"
+ RenderBR {BR} at (111,442) size 0x0
+ RenderText {#text} at (0,447) size 111x21
+ text run at (0,447) width 111: "This is some text"
+ RenderBR {BR} at (111,463) size 0x0
+ RenderText {#text} at (0,468) size 111x21
+ text run at (0,468) width 111: "This is some text"
+ RenderBR {BR} at (111,484) size 0x0
+ RenderText {#text} at (0,489) size 111x21
+ text run at (0,489) width 111: "This is some text"
+ RenderBR {BR} at (111,505) size 0x0
+ RenderText {#text} at (0,510) size 111x21
+ text run at (0,510) width 111: "This is some text"
+ RenderBR {BR} at (111,526) size 0x0
+ RenderText {#text} at (0,531) size 111x21
+ text run at (0,531) width 111: "This is some text"
+ RenderBR {BR} at (111,547) size 0x0
+ RenderText {#text} at (0,552) size 111x21
+ text run at (0,552) width 111: "This is some text"
+ RenderBR {BR} at (111,568) size 0x0
+ RenderText {#text} at (0,573) size 111x21
+ text run at (0,573) width 111: "This is some text"
+ RenderBR {BR} at (111,589) size 0x0
+ RenderText {#text} at (0,600) size 111x21
+ text run at (0,600) width 111: "This is some text"
+ RenderBR {BR} at (111,616) size 0x0
+ RenderText {#text} at (0,621) size 111x21
+ text run at (0,621) width 111: "This is some text"
+ RenderBR {BR} at (111,637) size 0x0
+ RenderText {#text} at (0,642) size 111x21
+ text run at (0,642) width 111: "This is some text"
+ RenderBR {BR} at (111,658) size 0x0
+ RenderText {#text} at (0,663) size 111x21
+ text run at (0,663) width 111: "This is some text"
+ RenderBR {BR} at (111,679) size 0x0
+ RenderText {#text} at (0,684) size 111x21
+ text run at (0,684) width 111: "This is some text"
+ RenderBR {BR} at (111,700) size 0x0
+ RenderText {#text} at (0,705) size 111x21
+ text run at (0,705) width 111: "This is some text"
+ RenderBR {BR} at (111,721) size 0x0
+ RenderText {#text} at (0,726) size 111x21
+ text run at (0,726) width 111: "This is some text"
+ RenderBR {BR} at (111,742) size 0x0
+ RenderText {#text} at (0,747) size 111x21
+ text run at (0,747) width 111: "This is some text"
+ RenderBR {BR} at (111,763) size 0x0
+ RenderText {#text} at (0,768) size 111x21
+ text run at (0,768) width 111: "This is some text"
+ RenderBR {BR} at (111,784) size 0x0
+ RenderText {#text} at (0,789) size 111x21
+ text run at (0,789) width 111: "This is some text"
+ RenderBR {BR} at (111,805) size 0x0
+ RenderText {#text} at (0,810) size 111x21
+ text run at (0,810) width 111: "This is some text"
+ RenderBR {BR} at (111,826) size 0x0
+ RenderText {#text} at (0,831) size 111x21
+ text run at (0,831) width 111: "This is some text"
+ RenderBR {BR} at (111,847) size 0x0
+ RenderText {#text} at (0,852) size 111x21
+ text run at (0,852) width 111: "This is some text"
+ RenderBR {BR} at (111,868) size 0x0
+ RenderText {#text} at (0,873) size 111x21
+ text run at (0,873) width 111: "This is some text"
+ RenderBR {BR} at (111,889) size 0x0
+ RenderText {#text} at (0,900) size 111x21
+ text run at (0,900) width 111: "This is some text"
+ RenderBR {BR} at (111,916) size 0x0
+ RenderText {#text} at (0,921) size 111x21
+ text run at (0,921) width 111: "This is some text"
+ RenderBR {BR} at (111,937) size 0x0
+ RenderText {#text} at (0,942) size 111x21
+ text run at (0,942) width 111: "This is some text"
+ RenderBR {BR} at (111,958) size 0x0
+ RenderText {#text} at (0,963) size 111x21
+ text run at (0,963) width 111: "This is some text"
+ RenderBR {BR} at (111,979) size 0x0
+ RenderText {#text} at (0,984) size 111x21
+ text run at (0,984) width 111: "This is some text"
+ RenderBR {BR} at (111,1000) size 0x0
+ RenderText {#text} at (0,1005) size 111x21
+ text run at (0,1005) width 111: "This is some text"
+ RenderBR {BR} at (111,1021) size 0x0
+ RenderText {#text} at (0,1026) size 111x21
+ text run at (0,1026) width 111: "This is some text"
+ RenderBR {BR} at (111,1042) size 0x0
+ RenderText {#text} at (0,1047) size 111x21
+ text run at (0,1047) width 111: "This is some text"
+ RenderBR {BR} at (111,1063) size 0x0
+ RenderText {#text} at (0,1068) size 111x21
+ text run at (0,1068) width 111: "This is some text"
+ RenderBR {BR} at (111,1084) size 0x0
+ RenderText {#text} at (0,1089) size 111x21
+ text run at (0,1089) width 111: "This is some text"
+ RenderBR {BR} at (111,1105) size 0x0
+ RenderText {#text} at (0,1110) size 111x21
+ text run at (0,1110) width 111: "This is some text"
+ RenderBR {BR} at (111,1126) size 0x0
+ RenderText {#text} at (0,1131) size 111x21
+ text run at (0,1131) width 111: "This is some text"
+ RenderBR {BR} at (111,1147) size 0x0
+ RenderText {#text} at (0,1152) size 111x21
+ text run at (0,1152) width 111: "This is some text"
+ RenderBR {BR} at (111,1168) size 0x0
+ RenderText {#text} at (0,1173) size 111x21
+ text run at (0,1173) width 111: "This is some text"
+ RenderBR {BR} at (111,1189) size 0x0
+ RenderText {#text} at (0,1200) size 111x21
+ text run at (0,1200) width 111: "This is some text"
+ RenderBR {BR} at (111,1216) size 0x0
+ RenderText {#text} at (0,1221) size 111x21
+ text run at (0,1221) width 111: "This is some text"
+ RenderBR {BR} at (111,1237) size 0x0
+ RenderText {#text} at (0,1242) size 111x21
+ text run at (0,1242) width 111: "This is some text"
+ RenderBR {BR} at (111,1258) size 0x0
+ RenderText {#text} at (0,1263) size 111x21
+ text run at (0,1263) width 111: "This is some text"
+ RenderBR {BR} at (111,1279) size 0x0
+ RenderText {#text} at (0,1284) size 111x21
+ text run at (0,1284) width 111: "This is some text"
+ RenderBR {BR} at (111,1300) size 0x0
+ RenderText {#text} at (0,1305) size 111x21
+ text run at (0,1305) width 111: "This is some text"
+ RenderBR {BR} at (111,1321) size 0x0
+ RenderText {#text} at (0,1326) size 111x21
+ text run at (0,1326) width 111: "This is some text"
+ RenderBR {BR} at (111,1342) size 0x0
+ RenderText {#text} at (0,1347) size 111x21
+ text run at (0,1347) width 111: "This is some text"
+ RenderBR {BR} at (111,1363) size 0x0
+ RenderText {#text} at (0,1368) size 111x21
+ text run at (0,1368) width 111: "This is some text"
+ RenderBR {BR} at (111,1384) size 0x0
+ RenderText {#text} at (0,1389) size 111x21
+ text run at (0,1389) width 111: "This is some text"
+ RenderBR {BR} at (111,1405) size 0x0
+ RenderText {#text} at (0,1410) size 111x21
+ text run at (0,1410) width 111: "This is some text"
+ RenderBR {BR} at (111,1426) size 0x0
+ RenderText {#text} at (0,1431) size 111x21
+ text run at (0,1431) width 111: "This is some text"
+ RenderBR {BR} at (111,1447) size 0x0
+ RenderText {#text} at (0,1452) size 111x21
+ text run at (0,1452) width 111: "This is some text"
+ RenderBR {BR} at (111,1468) size 0x0
+ RenderText {#text} at (0,1473) size 111x21
+ text run at (0,1473) width 111: "This is some text"
+ RenderBR {BR} at (111,1489) size 0x0
+ RenderText {#text} at (0,1500) size 111x21
+ text run at (0,1500) width 111: "This is some text"
+ RenderBR {BR} at (111,1516) size 0x0
+ RenderText {#text} at (0,1521) size 111x21
+ text run at (0,1521) width 111: "This is some text"
+ RenderBR {BR} at (111,1537) size 0x0
+ RenderText {#text} at (0,1542) size 111x21
+ text run at (0,1542) width 111: "This is some text"
+ RenderBR {BR} at (111,1558) size 0x0
+ RenderText {#text} at (0,1563) size 111x21
+ text run at (0,1563) width 111: "This is some text"
+ RenderBR {BR} at (111,1579) size 0x0
+ RenderText {#text} at (0,1584) size 111x21
+ text run at (0,1584) width 111: "This is some text"
+ RenderBR {BR} at (111,1600) size 0x0
+ RenderText {#text} at (0,1605) size 111x21
+ text run at (0,1605) width 111: "This is some text"
+ RenderBR {BR} at (111,1621) size 0x0
+ RenderText {#text} at (0,1626) size 111x21
+ text run at (0,1626) width 111: "This is some text"
+ RenderBR {BR} at (111,1642) size 0x0
+ RenderText {#text} at (0,1647) size 111x21
+ text run at (0,1647) width 111: "This is some text"
+ RenderBR {BR} at (111,1663) size 0x0
+ RenderText {#text} at (0,1668) size 111x21
+ text run at (0,1668) width 111: "This is some text"
+ RenderBR {BR} at (111,1684) size 0x0
+ RenderText {#text} at (0,1689) size 111x21
+ text run at (0,1689) width 111: "This is some text"
+ RenderBR {BR} at (111,1705) size 0x0
+ RenderText {#text} at (0,1710) size 111x21
+ text run at (0,1710) width 111: "This is some text"
+ RenderBR {BR} at (111,1726) size 0x0
+ RenderText {#text} at (0,1731) size 111x21
+ text run at (0,1731) width 111: "This is some text"
+ RenderBR {BR} at (111,1747) size 0x0
+ RenderText {#text} at (0,1752) size 111x21
+ text run at (0,1752) width 111: "This is some text"
+ RenderBR {BR} at (111,1768) size 0x0
+ RenderText {#text} at (0,1773) size 111x21
+ text run at (0,1773) width 111: "This is some text"
+ RenderBR {BR} at (111,1789) size 0x0
+ RenderText {#text} at (0,1800) size 111x21
+ text run at (0,1800) width 111: "This is some text"
+ RenderBR {BR} at (111,1816) size 0x0
+ RenderText {#text} at (0,1821) size 111x21
+ text run at (0,1821) width 111: "This is some text"
+ RenderBR {BR} at (111,1837) size 0x0
+ RenderText {#text} at (0,1842) size 111x21
+ text run at (0,1842) width 111: "This is some text"
+ RenderBR {BR} at (111,1858) size 0x0
+ RenderText {#text} at (0,1863) size 111x21
+ text run at (0,1863) width 111: "This is some text"
+ RenderBR {BR} at (111,1879) size 0x0
+ RenderText {#text} at (0,1884) size 111x21
+ text run at (0,1884) width 111: "This is some text"
+ RenderBR {BR} at (111,1900) size 0x0
+ RenderText {#text} at (0,1905) size 111x21
+ text run at (0,1905) width 111: "This is some text"
+ RenderBR {BR} at (111,1921) size 0x0
+ RenderText {#text} at (0,1926) size 111x21
+ text run at (0,1926) width 111: "This is some text"
+ RenderBR {BR} at (111,1942) size 0x0
+ RenderText {#text} at (0,1947) size 111x21
+ text run at (0,1947) width 111: "This is some text"
+ RenderBR {BR} at (111,1963) size 0x0
+ RenderText {#text} at (0,1968) size 111x21
+ text run at (0,1968) width 111: "This is some text"
+ RenderBR {BR} at (111,1984) size 0x0
+ RenderText {#text} at (0,1989) size 111x21
+ text run at (0,1989) width 111: "This is some text"
+ RenderBR {BR} at (111,2005) size 0x0
+ RenderText {#text} at (0,2010) size 111x21
+ text run at (0,2010) width 111: "This is some text"
+ RenderBR {BR} at (111,2026) size 0x0
+ RenderText {#text} at (0,2031) size 111x21
+ text run at (0,2031) width 111: "This is some text"
+ RenderBR {BR} at (111,2047) size 0x0
+ RenderText {#text} at (0,2052) size 111x21
+ text run at (0,2052) width 111: "This is some text"
+ RenderBR {BR} at (111,2068) size 0x0
+ RenderText {#text} at (0,2073) size 111x21
+ text run at (0,2073) width 111: "This is some text"
+ RenderBR {BR} at (111,2089) size 0x0
RenderText {#text} at (0,2100) size 111x21
text run at (0,2100) width 111: "This is some text"
RenderBR {BR} at (111,2116) size 0x0
@@ -347,66 +341,72 @@ layer at (8,8) size 1254x300
RenderText {#text} at (0,2373) size 111x21
text run at (0,2373) width 111: "This is some text"
RenderBR {BR} at (111,2389) size 0x0
- RenderText {#text} at (0,2394) size 111x21
- text run at (0,2394) width 111: "This is some text"
- RenderBR {BR} at (111,2410) size 0x0
- RenderText {#text} at (0,2415) size 111x21
- text run at (0,2415) width 111: "This is some text"
- RenderBR {BR} at (111,2431) size 0x0
- RenderText {#text} at (0,2436) size 111x21
- text run at (0,2436) width 111: "This is some text"
- RenderBR {BR} at (111,2452) size 0x0
- RenderText {#text} at (0,2457) size 111x21
- text run at (0,2457) width 111: "This is some text"
- RenderBR {BR} at (111,2473) size 0x0
- RenderText {#text} at (0,2478) size 111x21
- text run at (0,2478) width 111: "This is some text"
- RenderBR {BR} at (111,2494) size 0x0
- RenderText {#text} at (0,2499) size 111x21
- text run at (0,2499) width 111: "This is some text"
- RenderBR {BR} at (111,2515) size 0x0
- RenderText {#text} at (0,2520) size 111x21
- text run at (0,2520) width 111: "This is some text"
- RenderBR {BR} at (111,2536) size 0x0
- RenderText {#text} at (0,2541) size 111x21
- text run at (0,2541) width 111: "This is some text"
- RenderBR {BR} at (111,2557) size 0x0
- RenderText {#text} at (0,2562) size 111x21
- text run at (0,2562) width 111: "This is some text"
- RenderBR {BR} at (111,2578) size 0x0
- RenderText {#text} at (0,2583) size 111x21
- text run at (0,2583) width 111: "This is some text"
- RenderBR {BR} at (111,2599) size 0x0
- RenderText {#text} at (0,2604) size 111x21
- text run at (0,2604) width 111: "This is some text"
- RenderBR {BR} at (111,2620) size 0x0
- RenderText {#text} at (0,2625) size 111x21
- text run at (0,2625) width 111: "This is some text"
- RenderBR {BR} at (111,2641) size 0x0
- RenderText {#text} at (0,2646) size 111x21
- text run at (0,2646) width 111: "This is some text"
- RenderBR {BR} at (111,2662) size 0x0
- RenderText {#text} at (0,2667) size 111x21
- text run at (0,2667) width 111: "This is some text"
- RenderBR {BR} at (111,2683) size 0x0
- RenderText {#text} at (0,2688) size 111x21
- text run at (0,2688) width 111: "This is some text"
- RenderBR {BR} at (111,2704) size 0x0
- RenderText {#text} at (0,2709) size 111x21
- text run at (0,2709) width 111: "This is some text"
- RenderBR {BR} at (111,2725) size 0x0
- RenderText {#text} at (0,2730) size 111x21
- text run at (0,2730) width 111: "This is some text"
- RenderBR {BR} at (111,2746) size 0x0
- RenderText {#text} at (0,2751) size 111x21
- text run at (0,2751) width 111: "This is some text"
- RenderBR {BR} at (111,2767) size 0x0
- RenderText {#text} at (0,2772) size 111x21
- text run at (0,2772) width 111: "This is some text"
- RenderBR {BR} at (111,2788) size 0x0
- RenderText {#text} at (0,2793) size 111x21
- text run at (0,2793) width 111: "This is some text"
- RenderBR {BR} at (111,2809) size 0x0
- RenderText {#text} at (0,2814) size 111x21
- text run at (0,2814) width 111: "This is some text"
- RenderBR {BR} at (111,2830) size 0x0
+ RenderText {#text} at (0,2400) size 111x21
+ text run at (0,2400) width 111: "This is some text"
+ RenderBR {BR} at (111,2416) size 0x0
+ RenderText {#text} at (0,2421) size 111x21
+ text run at (0,2421) width 111: "This is some text"
+ RenderBR {BR} at (111,2437) size 0x0
+ RenderText {#text} at (0,2442) size 111x21
+ text run at (0,2442) width 111: "This is some text"
+ RenderBR {BR} at (111,2458) size 0x0
+ RenderText {#text} at (0,2463) size 111x21
+ text run at (0,2463) width 111: "This is some text"
+ RenderBR {BR} at (111,2479) size 0x0
+ RenderText {#text} at (0,2484) size 111x21
+ text run at (0,2484) width 111: "This is some text"
+ RenderBR {BR} at (111,2500) size 0x0
+ RenderText {#text} at (0,2505) size 111x21
+ text run at (0,2505) width 111: "This is some text"
+ RenderBR {BR} at (111,2521) size 0x0
+ RenderText {#text} at (0,2526) size 111x21
+ text run at (0,2526) width 111: "This is some text"
+ RenderBR {BR} at (111,2542) size 0x0
+ RenderText {#text} at (0,2547) size 111x21
+ text run at (0,2547) width 111: "This is some text"
+ RenderBR {BR} at (111,2563) size 0x0
+ RenderText {#text} at (0,2568) size 111x21
+ text run at (0,2568) width 111: "This is some text"
+ RenderBR {BR} at (111,2584) size 0x0
+ RenderText {#text} at (0,2589) size 111x21
+ text run at (0,2589) width 111: "This is some text"
+ RenderBR {BR} at (111,2605) size 0x0
+ RenderText {#text} at (0,2610) size 111x21
+ text run at (0,2610) width 111: "This is some text"
+ RenderBR {BR} at (111,2626) size 0x0
+ RenderText {#text} at (0,2631) size 111x21
+ text run at (0,2631) width 111: "This is some text"
+ RenderBR {BR} at (111,2647) size 0x0
+ RenderText {#text} at (0,2652) size 111x21
+ text run at (0,2652) width 111: "This is some text"
+ RenderBR {BR} at (111,2668) size 0x0
+ RenderText {#text} at (0,2673) size 111x21
+ text run at (0,2673) width 111: "This is some text"
+ RenderBR {BR} at (111,2689) size 0x0
+ RenderText {#text} at (0,2700) size 111x21
+ text run at (0,2700) width 111: "This is some text"
+ RenderBR {BR} at (111,2716) size 0x0
+ RenderText {#text} at (0,2721) size 111x21
+ text run at (0,2721) width 111: "This is some text"
+ RenderBR {BR} at (111,2737) size 0x0
+ RenderText {#text} at (0,2742) size 111x21
+ text run at (0,2742) width 111: "This is some text"
+ RenderBR {BR} at (111,2758) size 0x0
+ RenderText {#text} at (0,2763) size 111x21
+ text run at (0,2763) width 111: "This is some text"
+ RenderBR {BR} at (111,2779) size 0x0
+ RenderText {#text} at (0,2784) size 111x21
+ text run at (0,2784) width 111: "This is some text"
+ RenderBR {BR} at (111,2800) size 0x0
+ RenderText {#text} at (0,2805) size 111x21
+ text run at (0,2805) width 111: "This is some text"
+ RenderBR {BR} at (111,2821) size 0x0
+ RenderText {#text} at (0,2826) size 111x21
+ text run at (0,2826) width 111: "This is some text"
+ RenderBR {BR} at (111,2842) size 0x0
+ RenderText {#text} at (0,2847) size 111x21
+ text run at (0,2847) width 111: "This is some text"
+ RenderBR {BR} at (111,2863) size 0x0
+ RenderText {#text} at (0,2868) size 111x21
+ text run at (0,2868) width 111: "This is some text"
+ RenderBR {BR} at (111,2884) size 0x0
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-style-inheritance-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/anonymous-style-inheritance-expected.txt
index 683d54e..f51bb85 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/anonymous-style-inheritance-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/anonymous-style-inheritance-expected.txt
@@ -1,17 +1,17 @@
layer at (0,0) size 843x584
RenderView at (0,0) size 800x584
-layer at (0,0) size 843x557
- RenderBlock {HTML} at (0,0) size 800x557
- RenderBody {BODY} at (8,17) size 784x523
-layer at (8,17) size 835x523
- RenderBlock {DIV} at (0,0) size 835x523 [border: (5px solid #800000)]
+layer at (0,0) size 843x581
+ RenderBlock {HTML} at (0,0) size 800x581
+ RenderBody {BODY} at (8,17) size 784x547
+layer at (8,17) size 835x547
+ RenderBlock {DIV} at (0,0) size 835x547 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,26) size 825x34
RenderBlock {H2} at (0,0) size 825x34 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 723x33
text run at (0,0) width 723: "This is a spanning element at the beginning of the columns block."
-layer at (13,98) size 825x437
- RenderBlock (anonymous multi-column) at (5,81) size 825x437
- RenderText {#text} at (0,0) size 402x898
+layer at (13,98) size 825x461
+ RenderBlock (anonymous multi-column) at (5,81) size 825x461
+ RenderText {#text} at (0,0) size 402x899
text run at (0,0) width 322: "Lorem ipsum dolor sit amet, consectetuer"
text run at (0,23) width 391: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
text run at (0,46) width 364: "sollicitudin felis quis lectus. Quisque adipiscing"
@@ -33,24 +33,24 @@ layer at (13,98) size 825x437
text run at (0,391) width 339: "felis vel orci sagittis aliquam. Cras convallis"
text run at (0,414) width 353: "adipiscing sem. Nam nonummy enim. Nullam"
text run at (0,437) width 370: "bibendum lobortis neque. Vestibulum velit orci,"
- text run at (0,460) width 363: "tempus euismod, pretium quis, interdum vitae,"
- text run at (0,483) width 376: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,506) width 386: "vestibulum. Suspendisse hendrerit quam nec felis."
- text run at (0,529) width 398: "Sed varius turpis vitae pede. Lorem ipsum dolor sit"
- text run at (0,552) width 266: "amet, consectetuer adipiscing elit. "
- text run at (266,552) width 104: "Lorem ipsum"
- text run at (0,575) width 377: "dolor sit amet, consectetuer adipiscing elit. Nulla"
- text run at (0,598) width 390: "varius enim ac mi. Curabitur sollicitudin felis quis"
- text run at (0,621) width 400: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (0,644) width 402: "purus, vulputate vel, varius ut, euismod et, nisi. Sed"
- text run at (0,667) width 381: "vitae felis vel orci sagittis aliquam. Cras convallis"
- text run at (0,690) width 353: "adipiscing sem. Nam nonummy enim. Nullam"
- text run at (0,713) width 370: "bibendum lobortis neque. Vestibulum velit orci,"
- text run at (0,736) width 363: "tempus euismod, pretium quis, interdum vitae,"
- text run at (0,759) width 376: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,782) width 386: "vestibulum. Suspendisse hendrerit quam nec felis."
- text run at (0,805) width 398: "Sed varius turpis vitae pede. Lorem ipsum dolor sit"
- text run at (0,828) width 266: "amet, consectetuer adipiscing elit. "
- text run at (266,828) width 104: "Lorem ipsum"
- text run at (0,851) width 377: "dolor sit amet, consectetuer adipiscing elit. Nulla"
- text run at (0,874) width 143: "varius enim ac mi."
+ text run at (0,461) width 363: "tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,484) width 376: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,507) width 386: "vestibulum. Suspendisse hendrerit quam nec felis."
+ text run at (0,530) width 398: "Sed varius turpis vitae pede. Lorem ipsum dolor sit"
+ text run at (0,553) width 266: "amet, consectetuer adipiscing elit. "
+ text run at (266,553) width 104: "Lorem ipsum"
+ text run at (0,576) width 377: "dolor sit amet, consectetuer adipiscing elit. Nulla"
+ text run at (0,599) width 390: "varius enim ac mi. Curabitur sollicitudin felis quis"
+ text run at (0,622) width 400: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+ text run at (0,645) width 402: "purus, vulputate vel, varius ut, euismod et, nisi. Sed"
+ text run at (0,668) width 381: "vitae felis vel orci sagittis aliquam. Cras convallis"
+ text run at (0,691) width 353: "adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (0,714) width 370: "bibendum lobortis neque. Vestibulum velit orci,"
+ text run at (0,737) width 363: "tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,760) width 376: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,783) width 386: "vestibulum. Suspendisse hendrerit quam nec felis."
+ text run at (0,806) width 398: "Sed varius turpis vitae pede. Lorem ipsum dolor sit"
+ text run at (0,829) width 266: "amet, consectetuer adipiscing elit. "
+ text run at (266,829) width 104: "Lorem ipsum"
+ text run at (0,852) width 377: "dolor sit amet, consectetuer adipiscing elit. Nulla"
+ text run at (0,875) width 143: "varius enim ac mi."
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt
index 43e5f5f..f689092 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-complex-splitting-expected.txt
@@ -1,21 +1,21 @@
-layer at (0,0) size 784x1742
+layer at (0,0) size 784x1743
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x1742
- RenderBlock {HTML} at (0,0) size 784x1742
- RenderBody {BODY} at (8,16) size 768x1710
-layer at (8,16) size 760x568
- RenderBlock {DIV} at (0,0) size 760x568 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,276) size 750x31
+layer at (0,0) size 784x1743
+ RenderBlock {HTML} at (0,0) size 784x1743
+ RenderBody {BODY} at (8,16) size 768x1711
+layer at (8,16) size 760x569
+ RenderBlock {DIV} at (0,0) size 760x569 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,277) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 193x32
text run at (0,0) width 193: "This is a first span."
- RenderBlock (anonymous multi-column span) at (5,366) size 750x31
+ RenderBlock (anonymous multi-column span) at (5,367) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 219x32
text run at (0,0) width 219: "This is a second span."
-layer at (13,21) size 750x252
- RenderBlock (anonymous multi-column) at (5,5) size 750x252
- RenderText {#text} at (0,0) size 367x483
+layer at (13,21) size 750x253
+ RenderBlock (anonymous multi-column) at (5,5) size 750x253
+ RenderText {#text} at (0,0) size 367x484
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -29,24 +29,24 @@ layer at (13,21) size 750x252
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 188: "consectetuer adipiscing elit. "
text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (13,342) size 750x21
- RenderBlock (anonymous multi-column) at (5,326) size 750x21
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,295) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,316) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,337) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,358) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,379) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (13,343) size 750x21
+ RenderBlock (anonymous multi-column) at (5,327) size 750x21
RenderText {#text} at (0,0) size 328x42
text run at (0,0) width 328: "This text should be sitting between two spanning"
text run at (0,21) width 62: "elements."
-layer at (13,432) size 750x147
- RenderBlock (anonymous multi-column) at (5,416) size 750x147
+layer at (13,433) size 750x147
+ RenderBlock (anonymous multi-column) at (5,417) size 750x147
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -63,8 +63,8 @@ layer at (13,432) size 750x147
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
-layer at (8,600) size 760x563
- RenderBlock {DIV} at (0,584) size 760x563 [border: (5px solid #800000)]
+layer at (8,601) size 760x563
+ RenderBlock {DIV} at (0,585) size 760x563 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,166) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 193x32
@@ -73,7 +73,7 @@ layer at (8,600) size 760x563
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 219x32
text run at (0,0) width 219: "This is a second span."
-layer at (13,621) size 750x126
+layer at (13,622) size 750x126
RenderBlock (anonymous multi-column) at (5,21) size 750x126
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -89,7 +89,7 @@ layer at (13,621) size 750x126
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,816) size 750x126
+layer at (13,817) size 750x126
RenderBlock (anonymous multi-column) at (5,216) size 750x126
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -105,7 +105,7 @@ layer at (13,816) size 750x126
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,1011) size 750x147
+layer at (13,1012) size 750x147
RenderBlock (anonymous multi-column) at (5,411) size 750x147
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -123,8 +123,8 @@ layer at (13,1011) size 750x147
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
-layer at (8,1179) size 760x547
- RenderBlock {DIV} at (0,1163) size 760x547 [border: (5px solid #800000)]
+layer at (8,1180) size 760x547
+ RenderBlock {DIV} at (0,1164) size 760x547 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,150) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 193x32
@@ -133,7 +133,7 @@ layer at (8,1179) size 760x547
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 219x32
text run at (0,0) width 219: "This is a second span."
-layer at (13,1184) size 750x126
+layer at (13,1185) size 750x126
RenderBlock (anonymous multi-column) at (5,5) size 750x126
RenderBlock (anonymous) at (0,0) size 367x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -156,7 +156,7 @@ layer at (13,1184) size 750x126
RenderBlock (anonymous) at (0,252) size 367x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (13,1379) size 750x126
+layer at (13,1380) size 750x126
RenderBlock (anonymous multi-column) at (5,200) size 750x126
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -172,7 +172,7 @@ layer at (13,1379) size 750x126
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,1574) size 750x147
+layer at (13,1575) size 750x147
RenderBlock (anonymous multi-column) at (5,395) size 750x147
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt
index 70f2a14..fac9247 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 784x3180
+layer at (0,0) size 784x3252
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x3180
- RenderBlock {HTML} at (0,0) size 784x3180
- RenderBody {BODY} at (8,16) size 768x3148
+layer at (0,0) size 784x3252
+ RenderBlock {HTML} at (0,0) size 784x3252
+ RenderBody {BODY} at (8,16) size 768x3220
layer at (8,16) size 760x499
RenderBlock {DIV} at (0,0) size 760x499 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,45) size 750x31
@@ -117,38 +117,38 @@ layer at (13,1004) size 750x21
RenderBlock (generated) at (0,0) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 170x21
text run at (0,0) width 170: "After Generated Content"
-layer at (8,1046) size 760x499
- RenderBlock {DIV} at (0,1030) size 760x499 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,192) size 750x31
+layer at (8,1046) size 760x530
+ RenderBlock {DIV} at (0,1030) size 760x530 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,203) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1051) size 750x168
- RenderBlock (anonymous multi-column) at (5,5) size 750x168
+layer at (13,1051) size 750x179
+ RenderBlock (anonymous multi-column) at (5,5) size 750x179
RenderBlock (generated) at (0,0) size 367x21 [bgcolor=#FFFF00]
RenderText at (0,0) size 179x21
text run at (0,0) width 179: "Before Generated Content"
- RenderBlock {P} at (0,37) size 367x294
- RenderText {#text} at (0,0) size 367x294
+ RenderBlock {P} at (0,37) size 367x310
+ RenderText {#text} at (0,0) size 367x310
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 188: "consectetuer adipiscing elit. "
- text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 40: "ac mi."
-layer at (13,1288) size 750x252
- RenderBlock (anonymous multi-column) at (5,242) size 750x252
- RenderBlock {P} at (0,0) size 367x483
- RenderText {#text} at (0,0) size 367x483
+ text run at (0,142) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,163) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,184) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,205) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,226) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,247) width 188: "consectetuer adipiscing elit. "
+ text run at (188,247) width 150: "Lorem ipsum dolor sit"
+ text run at (0,268) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,289) width 40: "ac mi."
+layer at (13,1299) size 750x272
+ RenderBlock (anonymous multi-column) at (5,253) size 750x272
+ RenderBlock {P} at (0,0) size 367x503
+ RenderText {#text} at (0,0) size 367x503
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -162,33 +162,33 @@ layer at (13,1288) size 750x252
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 188: "consectetuer adipiscing elit. "
text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- RenderBlock (generated) at (0,499) size 367x20 [bgcolor=#FFFF00]
+ text run at (0,272) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,293) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,314) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,335) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,356) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,377) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,398) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,419) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,440) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,461) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,482) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ RenderBlock (generated) at (0,519) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 170x21
text run at (0,0) width 170: "After Generated Content"
-layer at (8,1561) size 760x515
- RenderBlock {DIV} at (0,1545) size 760x515 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,192) size 750x31
+layer at (8,1592) size 760x540
+ RenderBlock {DIV} at (0,1576) size 760x540 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,193) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1566) size 750x168
- RenderBlock (anonymous multi-column) at (5,5) size 750x168
+layer at (13,1597) size 750x169
+ RenderBlock (anonymous multi-column) at (5,5) size 750x169
RenderBlock (generated) at (0,0) size 367x21 [bgcolor=#FFFF00]
RenderText at (0,0) size 179x21
text run at (0,0) width 179: "Before Generated Content"
- RenderBlock (anonymous) at (0,21) size 367x294
- RenderText {#text} at (0,0) size 367x294
+ RenderBlock (anonymous) at (0,21) size 367x295
+ RenderText {#text} at (0,0) size 367x295
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -196,16 +196,16 @@ layer at (13,1566) size 750x168
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 188: "consectetuer adipiscing elit. "
- text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 40: "ac mi."
-layer at (13,1803) size 750x268
- RenderBlock (anonymous multi-column) at (5,242) size 750x268
+ text run at (0,148) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,169) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,190) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,211) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,232) width 188: "consectetuer adipiscing elit. "
+ text run at (188,232) width 150: "Lorem ipsum dolor sit"
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 40: "ac mi."
+layer at (13,1835) size 750x292
+ RenderBlock (anonymous multi-column) at (5,243) size 750x292
RenderBlock (anonymous) at (0,0) size 367x252
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
@@ -223,31 +223,31 @@ layer at (13,1803) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,268) size 367x252
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock {P} at (0,268) size 367x255
+ RenderText {#text} at (0,0) size 367x255
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (generated) at (0,536) size 367x20 [bgcolor=#FFFF00]
+ text run at (0,24) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,45) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,66) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,87) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,108) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,129) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,150) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,171) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,192) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,213) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,234) width 184: "consectetuer adipiscing elit."
+ RenderBlock (generated) at (0,539) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 170x21
text run at (0,0) width 170: "After Generated Content"
-layer at (8,2092) size 760x520
- RenderBlock {DIV} at (0,2076) size 760x520 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,318) size 750x31
+layer at (8,2148) size 760x530
+ RenderBlock {DIV} at (0,2132) size 760x530 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,319) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,2097) size 750x294
- RenderBlock (anonymous multi-column) at (5,5) size 750x294
+layer at (13,2153) size 750x295
+ RenderBlock (anonymous multi-column) at (5,5) size 750x295
RenderBlock (generated) at (0,0) size 367x21 [bgcolor=#FFFF00]
RenderText at (0,0) size 179x21
text run at (0,0) width 179: "Before Generated Content"
@@ -266,12 +266,12 @@ layer at (13,2097) size 750x294
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,273) size 367x42
- RenderBlock {SPAN} at (0,0) size 367x42
- RenderText {#text} at (0,0) size 351x42
+ RenderBlock (anonymous) at (0,273) size 367x43
+ RenderBlock {SPAN} at (0,0) size 367x43
+ RenderText {#text} at (0,0) size 351x43
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock (anonymous) at (0,315) size 367x252
+ text run at (0,22) width 192: "elit. Nulla varius enim ac mi."
+ RenderBlock (anonymous) at (0,316) size 367x252
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
text run at (0,0) width 46: "Lorem"
@@ -288,10 +288,10 @@ layer at (13,2097) size 750x294
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,2460) size 750x147
- RenderBlock (anonymous multi-column) at (5,368) size 750x147
- RenderBlock {P} at (0,0) size 367x252
- RenderText {#text} at (0,0) size 367x252
+layer at (13,2517) size 750x156
+ RenderBlock (anonymous multi-column) at (5,369) size 750x156
+ RenderBlock {P} at (0,0) size 367x261
+ RenderText {#text} at (0,0) size 367x261
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -299,22 +299,22 @@ layer at (13,2460) size 750x147
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (generated) at (0,268) size 367x20 [bgcolor=#FFFF00]
+ text run at (0,156) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,177) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,198) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,219) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,240) width 184: "consectetuer adipiscing elit."
+ RenderBlock (generated) at (0,277) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 170x21
text run at (0,0) width 170: "After Generated Content"
-layer at (8,2628) size 760x536
- RenderBlock {DIV} at (0,2612) size 760x536 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,334) size 750x31
+layer at (8,2694) size 760x542
+ RenderBlock {DIV} at (0,2678) size 760x542 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,340) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,2633) size 750x310
- RenderBlock (anonymous multi-column) at (5,5) size 750x310
+layer at (13,2699) size 750x316
+ RenderBlock (anonymous multi-column) at (5,5) size 750x316
RenderBlock (generated) at (0,0) size 367x21 [bgcolor=#FFFF00]
RenderText at (0,0) size 179x21
text run at (0,0) width 179: "Before Generated Content"
@@ -332,11 +332,11 @@ layer at (13,2633) size 750x310
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,305) size 367x42
+ RenderBlock {P} at (0,316) size 367x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock {P} at (0,363) size 367x252
+ RenderBlock {P} at (0,374) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -350,8 +350,8 @@ layer at (13,2633) size 750x310
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,3012) size 750x147
- RenderBlock (anonymous multi-column) at (5,384) size 750x147
+layer at (13,3084) size 750x147
+ RenderBlock (anonymous multi-column) at (5,390) size 750x147
RenderBlock (anonymous) at (0,0) size 367x42
RenderInline {SPAN} at (0,0) size 351x42
RenderText {#text} at (0,0) size 351x42
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
index be948b3..f734379 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
@@ -1,20 +1,20 @@
-layer at (0,0) size 784x2878
+layer at (0,0) size 784x2920
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x2878
- RenderBlock {HTML} at (0,0) size 784x2878
- RenderBody {BODY} at (8,8) size 768x2854
+layer at (0,0) size 784x2920
+ RenderBlock {HTML} at (0,0) size 784x2920
+ RenderBody {BODY} at (8,8) size 768x2896
RenderBlock (anonymous) at (0,0) size 768x42
RenderText {#text} at (0,0) size 761x42
text run at (0,0) width 761: "In this test, all of the spanning elements have their spans turned off dynamically, and so they should just be in the"
text run at (0,21) width 87: "column flow."
RenderText {#text} at (0,0) size 0x0
-layer at (8,66) size 760x436
- RenderBlock {DIV} at (0,58) size 760x436 [border: (5px solid #800000)]
- RenderBlock {H2} at (5,24) size 367x31 [bgcolor=#EEEEEE]
+layer at (8,66) size 760x435
+ RenderBlock {DIV} at (0,58) size 760x435 [border: (5px solid #800000)]
+ RenderBlock {H2} at (5,5) size 367x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,74) size 367x777
- RenderText {#text} at (0,0) size 367x777
+ RenderBlock (anonymous) at (5,55) size 367x795
+ RenderText {#text} at (0,0) size 367x795
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -33,31 +33,31 @@ layer at (8,66) size 760x436
text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,518) size 760x436
- RenderBlock {DIV} at (0,510) size 760x436 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x777
- RenderText {#text} at (0,0) size 367x777
+ text run at (0,375) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,396) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,417) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,438) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,459) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,480) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,501) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,522) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,543) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,564) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,585) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,606) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,627) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,648) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,669) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,690) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,711) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,732) width 188: "consectetuer adipiscing elit. "
+ text run at (188,732) width 150: "Lorem ipsum dolor sit"
+ text run at (0,753) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,774) width 40: "ac mi."
+layer at (8,517) size 760x449
+ RenderBlock {DIV} at (0,509) size 760x449 [border: (5px solid #800000)]
+ RenderBlock (anonymous) at (5,5) size 367x796
+ RenderText {#text} at (0,0) size 367x796
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -79,30 +79,30 @@ layer at (8,518) size 760x436
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
- RenderBlock {H2} at (5,801) size 367x31 [bgcolor=#EEEEEE]
+ text run at (0,439) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,460) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,481) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,502) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,523) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,544) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,565) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,586) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,607) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,628) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,649) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,670) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,691) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,712) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,733) width 188: "consectetuer adipiscing elit. "
+ text run at (188,733) width 150: "Lorem ipsum dolor sit"
+ text run at (0,754) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,775) width 40: "ac mi."
+ RenderBlock {H2} at (5,820) size 367x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (8,970) size 760x452
- RenderBlock {DIV} at (0,962) size 760x452 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x294
+layer at (8,982) size 760x451
+ RenderBlock {DIV} at (0,974) size 760x451 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x294
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -119,37 +119,37 @@ layer at (8,970) size 760x452
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
- RenderBlock {H2} at (5,334) size 367x31 [bgcolor=#EEEEEE]
+ RenderBlock {H2} at (5,318) size 367x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock {P} at (5,384) size 367x483
- RenderText {#text} at (0,0) size 367x483
+ RenderBlock {P} at (5,368) size 367x498
+ RenderText {#text} at (0,0) size 367x498
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 188: "consectetuer adipiscing elit. "
- text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (8,1438) size 760x462
- RenderBlock {DIV} at (0,1430) size 760x462 [border: (5px solid #800000)]
+ text run at (0,78) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,99) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,120) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,141) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,162) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,183) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,204) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,225) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,246) width 188: "consectetuer adipiscing elit. "
+ text run at (188,246) width 150: "Lorem ipsum dolor sit"
+ text run at (0,267) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,288) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,309) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,330) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,351) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,372) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,393) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,414) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,435) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,456) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,477) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (8,1449) size 760x473
+ RenderBlock {DIV} at (0,1441) size 760x473 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x294
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -170,24 +170,24 @@ layer at (8,1438) size 760x462
RenderBlock {H2} at (5,318) size 367x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,368) size 367x252
+ RenderBlock (anonymous) at (5,368) size 367x268
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
text run at (0,0) width 46: "Lorem"
- RenderText {#text} at (46,0) size 367x252
+ RenderText {#text} at (46,0) size 367x268
text run at (46,0) width 305: " ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (5,636) size 367x252
+ text run at (0,100) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,121) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,142) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,163) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,184) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,205) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,226) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,247) width 184: "consectetuer adipiscing elit."
+ RenderBlock {P} at (5,652) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -201,8 +201,8 @@ layer at (8,1438) size 760x462
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,1916) size 760x452
- RenderBlock {DIV} at (0,1908) size 760x452 [border: (5px solid #800000)]
+layer at (8,1938) size 760x462
+ RenderBlock {DIV} at (0,1930) size 760x462 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x252
RenderInline {SPAN} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -223,11 +223,11 @@ layer at (8,1916) size 760x452
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,299) size 367x252
+ RenderBlock (anonymous) at (5,299) size 367x263
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
text run at (0,0) width 46: "Lorem"
- RenderText {#text} at (46,0) size 367x252
+ RenderText {#text} at (46,0) size 367x263
text run at (46,0) width 305: " ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -235,15 +235,15 @@ layer at (8,1916) size 760x452
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {H2} at (5,570) size 367x31 [bgcolor=#EEEEEE]
+ text run at (0,158) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,179) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,200) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,221) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,242) width 184: "consectetuer adipiscing elit."
+ RenderBlock {H2} at (5,581) size 367x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock {P} at (5,620) size 367x252
+ RenderBlock {P} at (5,631) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -257,9 +257,9 @@ layer at (8,1916) size 760x452
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,2384) size 760x478
- RenderBlock {DIV} at (0,2376) size 760x478 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x252
+layer at (8,2416) size 760x488
+ RenderBlock {DIV} at (0,2408) size 760x488 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -273,12 +273,12 @@ layer at (8,2384) size 760x478
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (5,289) size 367x42
+ RenderBlock {P} at (5,273) size 367x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock {P} at (5,347) size 367x252
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock {P} at (5,331) size 367x257
+ RenderText {#text} at (0,0) size 367x257
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -286,24 +286,24 @@ layer at (8,2384) size 760x478
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {H2} at (5,618) size 367x31 [bgcolor=#EEEEEE]
+ text run at (0,152) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,173) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,194) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,215) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,236) width 184: "consectetuer adipiscing elit."
+ RenderBlock {H2} at (5,607) size 367x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,668) size 367x42
+ RenderBlock (anonymous) at (5,657) size 367x42
RenderInline {SPAN} at (0,0) size 351x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 24: "elit."
- RenderBlock (anonymous) at (5,710) size 367x21
+ RenderBlock (anonymous) at (5,699) size 367x21
RenderBlock {SPAN} at (0,0) size 367x21
RenderText {#text} at (0,0) size 164x21
text run at (0,0) width 164: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,731) size 367x210
+ RenderBlock (anonymous) at (5,720) size 367x210
RenderInline {SPAN} at (0,0) size 357x210
RenderText {#text} at (0,0) size 357x210
text run at (0,0) width 315: "Curabitur sollicitudin felis quis lectus. Quisque"
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
index 00bf141..36d3b15 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
@@ -1,17 +1,17 @@
-layer at (0,0) size 784x3113
+layer at (0,0) size 784x3106
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x3113
- RenderBlock {HTML} at (0,0) size 784x3113
- RenderBody {BODY} at (8,16) size 768x3081
-layer at (8,16) size 760x478
- RenderBlock {DIV} at (0,0) size 760x478 [border: (5px solid #800000)]
+layer at (0,0) size 784x3106
+ RenderBlock {HTML} at (0,0) size 784x3106
+ RenderBody {BODY} at (8,16) size 768x3074
+layer at (8,16) size 760x479
+ RenderBlock {DIV} at (0,0) size 760x479 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,90) size 750x399
- RenderBlock (anonymous multi-column) at (5,74) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (13,90) size 750x400
+ RenderBlock (anonymous multi-column) at (5,74) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -32,34 +32,34 @@ layer at (13,90) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,510) size 760x478
- RenderBlock {DIV} at (0,494) size 760x478 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,423) size 750x31
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,511) size 760x479
+ RenderBlock {DIV} at (0,495) size 760x479 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,424) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,515) size 750x399
- RenderBlock (anonymous multi-column) at (5,5) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (13,516) size 750x400
+ RenderBlock (anonymous multi-column) at (5,5) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -80,32 +80,32 @@ layer at (13,515) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,1004) size 760x510
- RenderBlock {DIV} at (0,988) size 760x510 [border: (5px solid #800000)]
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,1006) size 760x511
+ RenderBlock {DIV} at (0,990) size 760x511 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,187) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1025) size 750x147
+layer at (13,1027) size 750x147
RenderBlock (anonymous multi-column) at (5,21) size 750x147
RenderBlock {P} at (0,0) size 367x294
RenderText {#text} at (0,0) size 367x294
@@ -124,10 +124,10 @@ layer at (13,1025) size 750x147
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
-layer at (13,1241) size 750x252
- RenderBlock (anonymous multi-column) at (5,237) size 750x252
- RenderBlock {P} at (0,0) size 367x483
- RenderText {#text} at (0,0) size 367x483
+layer at (13,1243) size 750x253
+ RenderBlock (anonymous multi-column) at (5,237) size 750x253
+ RenderBlock {P} at (0,0) size 367x484
+ RenderText {#text} at (0,0) size 367x484
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -141,24 +141,24 @@ layer at (13,1241) size 750x252
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 188: "consectetuer adipiscing elit. "
text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (8,1530) size 760x510
- RenderBlock {DIV} at (0,1514) size 760x510 [border: (5px solid #800000)]
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,295) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,316) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,337) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,358) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,379) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (8,1533) size 760x494
+ RenderBlock {DIV} at (0,1517) size 760x494 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,171) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1535) size 750x147
+layer at (13,1538) size 750x147
RenderBlock (anonymous multi-column) at (5,5) size 750x147
RenderBlock (anonymous) at (0,0) size 367x294
RenderText {#text} at (0,0) size 367x294
@@ -177,8 +177,8 @@ layer at (13,1535) size 750x147
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
-layer at (13,1751) size 750x268
- RenderBlock (anonymous multi-column) at (5,221) size 750x268
+layer at (13,1754) size 750x252
+ RenderBlock (anonymous multi-column) at (5,221) size 750x252
RenderBlock (anonymous) at (0,0) size 367x252
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
@@ -196,7 +196,7 @@ layer at (13,1751) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,268) size 367x252
+ RenderBlock {P} at (0,252) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -210,13 +210,13 @@ layer at (13,1751) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,2056) size 760x494
- RenderBlock {DIV} at (0,2040) size 760x494 [border: (5px solid #800000)]
+layer at (8,2043) size 760x494
+ RenderBlock {DIV} at (0,2027) size 760x494 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,297) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,2061) size 750x273
+layer at (13,2048) size 750x273
RenderBlock (anonymous multi-column) at (5,5) size 750x273
RenderBlock (anonymous) at (0,0) size 367x252
RenderInline {SPAN} at (0,0) size 367x252
@@ -255,7 +255,7 @@ layer at (13,2061) size 750x273
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,2403) size 750x126
+layer at (13,2390) size 750x126
RenderBlock (anonymous multi-column) at (5,347) size 750x126
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -271,14 +271,14 @@ layer at (13,2403) size 750x126
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,2566) size 760x531
- RenderBlock {DIV} at (0,2550) size 760x531 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,329) size 750x31
+layer at (8,2553) size 760x537
+ RenderBlock {DIV} at (0,2537) size 760x537 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,334) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,2587) size 750x289
- RenderBlock (anonymous multi-column) at (5,21) size 750x289
+layer at (13,2574) size 750x294
+ RenderBlock (anonymous multi-column) at (5,21) size 750x294
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -293,11 +293,11 @@ layer at (13,2587) size 750x289
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,268) size 367x42
- RenderText {#text} at (0,0) size 351x42
+ RenderBlock {P} at (0,268) size 367x47
+ RenderText {#text} at (0,0) size 351x47
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock {P} at (0,326) size 367x252
+ text run at (0,26) width 192: "elit. Nulla varius enim ac mi."
+ RenderBlock {P} at (0,331) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -311,8 +311,8 @@ layer at (13,2587) size 750x289
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,2945) size 750x147
- RenderBlock (anonymous multi-column) at (5,379) size 750x147
+layer at (13,2937) size 750x148
+ RenderBlock (anonymous multi-column) at (5,384) size 750x148
RenderBlock (anonymous) at (0,0) size 367x42
RenderInline {SPAN} at (0,0) size 351x42
RenderText {#text} at (0,0) size 351x42
@@ -322,17 +322,17 @@ layer at (13,2945) size 750x147
RenderBlock {SPAN} at (0,0) size 367x21
RenderText {#text} at (0,0) size 164x21
text run at (0,0) width 164: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (0,63) size 367x210
- RenderInline {SPAN} at (0,0) size 357x210
- RenderText {#text} at (0,0) size 357x210
+ RenderBlock (anonymous) at (0,63) size 367x211
+ RenderInline {SPAN} at (0,0) size 357x211
+ RenderText {#text} at (0,0) size 357x211
text run at (0,0) width 315: "Curabitur sollicitudin felis quis lectus. Quisque"
text run at (0,21) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
text run at (0,42) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
text run at (0,63) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,84) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,105) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,126) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,147) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,168) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,189) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,85) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,106) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,127) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,148) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,169) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,190) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-expected.txt
index 818a93f..9f77793 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-expected.txt
@@ -1,17 +1,17 @@
-layer at (0,0) size 784x4065
+layer at (0,0) size 784x4072
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x4065
- RenderBlock {HTML} at (0,0) size 784x4065
- RenderBody {BODY} at (8,16) size 768x4033
-layer at (8,16) size 760x478
- RenderBlock {DIV} at (0,0) size 760x478 [border: (5px solid #800000)]
+layer at (0,0) size 784x4072
+ RenderBlock {HTML} at (0,0) size 784x4072
+ RenderBody {BODY} at (8,16) size 768x4040
+layer at (8,16) size 760x479
+ RenderBlock {DIV} at (0,0) size 760x479 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 664x32
text run at (0,0) width 664: "This is a spanning element at the beginning of the columns block."
-layer at (13,90) size 750x399
- RenderBlock (anonymous multi-column) at (5,74) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (13,90) size 750x400
+ RenderBlock (anonymous multi-column) at (5,74) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -32,34 +32,34 @@ layer at (13,90) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,510) size 760x478
- RenderBlock {DIV} at (0,494) size 760x478 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,423) size 750x31
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,511) size 760x479
+ RenderBlock {DIV} at (0,495) size 760x479 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,424) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 600x32
text run at (0,0) width 600: "This is a spanning element at the end of the columns block."
-layer at (13,515) size 750x399
- RenderBlock (anonymous multi-column) at (5,5) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (13,516) size 750x400
+ RenderBlock (anonymous multi-column) at (5,5) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -80,32 +80,32 @@ layer at (13,515) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,1004) size 760x478
- RenderBlock {DIV} at (0,988) size 760x478 [border: (5px solid #800000)]
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,1006) size 760x479
+ RenderBlock {DIV} at (0,990) size 760x479 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,171) size 750x31
RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 634x32
text run at (0,0) width 634: "This is a spanning element in the middle of the columns block."
-layer at (13,1009) size 750x147
+layer at (13,1011) size 750x147
RenderBlock (anonymous multi-column) at (5,5) size 750x147
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -123,9 +123,9 @@ layer at (13,1009) size 750x147
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
-layer at (13,1225) size 750x252
- RenderBlock (anonymous multi-column) at (5,221) size 750x252
- RenderText {#text} at (0,0) size 367x483
+layer at (13,1227) size 750x253
+ RenderBlock (anonymous multi-column) at (5,221) size 750x253
+ RenderText {#text} at (0,0) size 367x484
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -139,19 +139,19 @@ layer at (13,1225) size 750x252
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 188: "consectetuer adipiscing elit. "
text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (8,1498) size 760x439
- RenderBlock {DIV} at (0,1482) size 760x439 [border: (5px solid #800000)]
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,295) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,316) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,337) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,358) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,379) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (8,1501) size 760x446
+ RenderBlock {DIV} at (0,1485) size 760x446 [border: (5px solid #800000)]
RenderText {#text} at (5,5) size 367x302
text run at (5,5) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (5,26) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -173,34 +173,34 @@ layer at (8,1498) size 760x439
text run at (49,278) width 321: "This is a spanning element with"
text run at (5,309) width 345: "an original display of inline in the"
text run at (5,340) width 294: "middle of the columns block."
- RenderText {#text} at (299,348) size 366x506
+ RenderText {#text} at (299,348) size 366x513
text run at (299,348) width 50: " Lorem"
text run at (5,371) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (5,392) width 345: "Nulla varius enim ac mi. Curabitur sollicitudin felis"
text run at (5,413) width 341: "quis lectus. Quisque adipiscing rhoncus sem. Proin"
- text run at (5,434) width 356: "nulla purus, vulputate vel, varius ut, euismod et, nisi."
- text run at (5,455) width 356: "Sed vitae felis vel orci sagittis aliquam. Cras convallis"
- text run at (5,476) width 307: "adipiscing sem. Nam nonummy enim. Nullam"
- text run at (5,497) width 321: "bibendum lobortis neque. Vestibulum velit orci,"
- text run at (5,518) width 356: "tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (5,539) width 366: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (5,560) width 328: "Suspendisse hendrerit quam nec felis. Sed varius"
- text run at (5,581) width 311: "turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (5,602) width 188: "consectetuer adipiscing elit. "
- text run at (193,602) width 150: "Lorem ipsum dolor sit"
- text run at (5,623) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (5,644) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (5,665) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (5,686) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (5,707) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (5,728) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (5,749) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (5,770) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,791) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (5,812) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (5,833) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (8,1953) size 760x472
- RenderBlock {DIV} at (0,1937) size 760x472 [border: (5px solid #800000)]
+ text run at (5,441) width 356: "nulla purus, vulputate vel, varius ut, euismod et, nisi."
+ text run at (5,462) width 356: "Sed vitae felis vel orci sagittis aliquam. Cras convallis"
+ text run at (5,483) width 307: "adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (5,504) width 321: "bibendum lobortis neque. Vestibulum velit orci,"
+ text run at (5,525) width 356: "tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (5,546) width 366: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (5,567) width 328: "Suspendisse hendrerit quam nec felis. Sed varius"
+ text run at (5,588) width 311: "turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (5,609) width 188: "consectetuer adipiscing elit. "
+ text run at (193,609) width 150: "Lorem ipsum dolor sit"
+ text run at (5,630) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (5,651) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (5,672) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (5,693) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (5,714) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (5,735) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (5,756) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (5,777) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (5,798) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (5,819) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (5,840) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (8,1963) size 760x475
+ RenderBlock {DIV} at (0,1947) size 760x475 [border: (5px solid #800000)]
RenderText {#text} at (5,5) size 367x294
text run at (5,5) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (5,26) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -222,40 +222,40 @@ layer at (8,1953) size 760x472
text run at (0,0) width 324: "This element specifies a column"
text run at (0,31) width 338: "span, but it is also floating, so the"
text run at (0,62) width 325: "column-span should be ignored."
- RenderText {#text} at (49,278) size 367x635
+ RenderText {#text} at (49,278) size 367x654
text run at (49,278) width 279: "Lorem ipsum dolor sit amet, consectetuer"
text run at (5,430) width 338: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
- text run at (5,451) width 313: "sollicitudin felis quis lectus. Quisque adipiscing"
- text run at (5,472) width 358: "rhoncus sem. Proin nulla purus, vulputate vel, varius"
- text run at (5,493) width 327: "ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (5,514) width 301: "aliquam. Cras convallis adipiscing sem. Nam"
- text run at (5,535) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (5,556) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (5,577) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,598) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (5,619) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (5,640) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,661) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (5,682) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (5,703) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (5,724) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (5,745) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (5,766) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (5,787) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,808) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (5,829) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (5,850) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (5,871) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (5,892) width 184: "consectetuer adipiscing elit."
-layer at (8,2441) size 760x520
- RenderBlock {DIV} at (0,2425) size 760x520 [border: (5px solid #800000)]
+ text run at (5,470) width 313: "sollicitudin felis quis lectus. Quisque adipiscing"
+ text run at (5,491) width 358: "rhoncus sem. Proin nulla purus, vulputate vel, varius"
+ text run at (5,512) width 327: "ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (5,533) width 301: "aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (5,554) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (5,575) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (5,596) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (5,617) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (5,638) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (5,659) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (5,680) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (5,701) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (5,722) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (5,743) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (5,764) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (5,785) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (5,806) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (5,827) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (5,848) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (5,869) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (5,890) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (5,911) width 184: "consectetuer adipiscing elit."
+layer at (8,2454) size 760x525
+ RenderBlock {DIV} at (0,2438) size 760x525 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x62
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 709x63
text run at (0,0) width 709: "This is a spanning element at the beginning of the columns block with"
text run at (0,31) width 145: "block siblings."
-layer at (13,2546) size 750x394
- RenderBlock (anonymous multi-column) at (5,105) size 750x394
+layer at (13,2559) size 750x399
+ RenderBlock (anonymous multi-column) at (5,105) size 750x399
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -270,21 +270,21 @@ layer at (13,2546) size 750x394
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,268) size 367x252
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock {P} at (0,268) size 367x257
+ RenderText {#text} at (0,0) size 367x257
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,536) size 367x252
+ text run at (0,131) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,152) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,173) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,194) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,215) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,236) width 184: "consectetuer adipiscing elit."
+ RenderBlock {P} at (0,541) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -298,15 +298,15 @@ layer at (13,2546) size 750x394
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,2977) size 760x520
- RenderBlock {DIV} at (0,2961) size 760x520 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,434) size 750x62
+layer at (8,2995) size 760x525
+ RenderBlock {DIV} at (0,2979) size 760x525 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,439) size 750x62
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 707x63
text run at (0,0) width 707: "This is a spanning element at the end of the columns block with block"
text run at (0,31) width 83: "siblings."
-layer at (13,2998) size 750x394
- RenderBlock (anonymous multi-column) at (5,21) size 750x394
+layer at (13,3016) size 750x399
+ RenderBlock (anonymous multi-column) at (5,21) size 750x399
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -321,21 +321,21 @@ layer at (13,2998) size 750x394
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,268) size 367x252
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock {P} at (0,268) size 367x257
+ RenderText {#text} at (0,0) size 367x257
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,536) size 367x252
+ text run at (0,131) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,152) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,173) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,194) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,215) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,236) width 184: "consectetuer adipiscing elit."
+ RenderBlock {P} at (0,541) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -349,15 +349,15 @@ layer at (13,2998) size 750x394
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,3513) size 760x536
- RenderBlock {DIV} at (0,3497) size 760x536 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,308) size 750x62
+layer at (8,3536) size 760x520
+ RenderBlock {DIV} at (0,3520) size 760x520 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,292) size 750x62
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 741x63
text run at (0,0) width 741: "This is a spanning element in the middle of the columns block with block"
text run at (0,31) width 83: "siblings."
-layer at (13,3534) size 750x268
- RenderBlock (anonymous multi-column) at (5,21) size 750x268
+layer at (13,3557) size 750x252
+ RenderBlock (anonymous multi-column) at (5,21) size 750x252
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -372,7 +372,7 @@ layer at (13,3534) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,268) size 367x252
+ RenderBlock {P} at (0,252) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -386,8 +386,8 @@ layer at (13,3534) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (13,3902) size 750x126
- RenderBlock (anonymous multi-column) at (5,389) size 750x126
+layer at (13,3909) size 750x126
+ RenderBlock (anonymous multi-column) at (5,373) size 750x126
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
index f93a150..d68e924 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
@@ -1,11 +1,11 @@
-layer at (0,0) size 784x2672
+layer at (0,0) size 784x2682
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x2672
- RenderBlock {HTML} at (0,0) size 784x2672
- RenderBody {BODY} at (8,16) size 768x2640
-layer at (8,16) size 760x409
- RenderBlock {DIV} at (0,0) size 760x409 [border: (5px solid #800000)]
- RenderText {#text} at (5,5) size 367x777
+layer at (0,0) size 784x2682
+ RenderBlock {HTML} at (0,0) size 784x2682
+ RenderBody {BODY} at (8,16) size 768x2650
+layer at (8,16) size 760x410
+ RenderBlock {DIV} at (0,0) size 760x410 [border: (5px solid #800000)]
+ RenderText {#text} at (5,5) size 367x778
text run at (5,5) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (5,26) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (5,47) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -26,28 +26,28 @@ layer at (8,16) size 760x409
text run at (5,341) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (5,362) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (5,383) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (5,404) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,425) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (5,446) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (5,467) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,488) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (5,509) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (5,530) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (5,551) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (5,572) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (5,593) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (5,614) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,635) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (5,656) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (5,677) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (5,698) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (5,719) width 188: "consectetuer adipiscing elit. "
- text run at (193,719) width 150: "Lorem ipsum dolor sit"
- text run at (5,740) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (5,761) width 40: "ac mi."
-layer at (8,441) size 760x409
- RenderBlock {DIV} at (0,425) size 760x409 [border: (5px solid #800000)]
- RenderText {#text} at (5,5) size 367x777
+ text run at (5,405) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (5,426) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (5,447) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (5,468) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (5,489) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (5,510) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (5,531) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (5,552) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (5,573) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (5,594) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (5,615) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (5,636) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (5,657) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (5,678) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (5,699) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (5,720) width 188: "consectetuer adipiscing elit. "
+ text run at (193,720) width 150: "Lorem ipsum dolor sit"
+ text run at (5,741) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (5,762) width 40: "ac mi."
+layer at (8,442) size 760x410
+ RenderBlock {DIV} at (0,426) size 760x410 [border: (5px solid #800000)]
+ RenderText {#text} at (5,5) size 367x778
text run at (5,5) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (5,26) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (5,47) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -68,28 +68,28 @@ layer at (8,441) size 760x409
text run at (5,341) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (5,362) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (5,383) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (5,404) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,425) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (5,446) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (5,467) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,488) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (5,509) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (5,530) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (5,551) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (5,572) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (5,593) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (5,614) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,635) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (5,656) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (5,677) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (5,698) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (5,719) width 188: "consectetuer adipiscing elit. "
- text run at (193,719) width 150: "Lorem ipsum dolor sit"
- text run at (5,740) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (5,761) width 40: "ac mi."
-layer at (8,866) size 760x425
- RenderBlock {DIV} at (0,850) size 760x425 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x294
+ text run at (5,405) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (5,426) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (5,447) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (5,468) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (5,489) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (5,510) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (5,531) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (5,552) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (5,573) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (5,594) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (5,615) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (5,636) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (5,657) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (5,678) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (5,699) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (5,720) width 188: "consectetuer adipiscing elit. "
+ text run at (193,720) width 150: "Lorem ipsum dolor sit"
+ text run at (5,741) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (5,762) width 40: "ac mi."
+layer at (8,868) size 760x426
+ RenderBlock {DIV} at (0,852) size 760x426 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x294
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -106,34 +106,34 @@ layer at (8,866) size 760x425
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
- RenderBlock {P} at (5,331) size 367x483
- RenderText {#text} at (0,0) size 367x483
+ RenderBlock {P} at (5,315) size 367x484
+ RenderText {#text} at (0,0) size 367x484
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 188: "consectetuer adipiscing elit. "
- text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (8,1307) size 760x430
- RenderBlock {DIV} at (0,1291) size 760x430 [border: (5px solid #800000)]
+ text run at (0,106) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,127) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,148) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,169) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,190) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,211) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,232) width 188: "consectetuer adipiscing elit. "
+ text run at (188,232) width 150: "Lorem ipsum dolor sit"
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,295) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,316) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,337) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,358) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,379) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (8,1310) size 760x436
+ RenderBlock {DIV} at (0,1294) size 760x436 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x294
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -151,24 +151,24 @@ layer at (8,1307) size 760x430
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
- RenderBlock (anonymous) at (5,299) size 367x252
+ RenderBlock (anonymous) at (5,299) size 367x258
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
text run at (0,0) width 46: "Lorem"
- RenderText {#text} at (46,0) size 367x252
+ RenderText {#text} at (46,0) size 367x258
text run at (46,0) width 305: " ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (5,567) size 367x252
+ text run at (0,132) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,153) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,174) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,195) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,216) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,237) width 184: "consectetuer adipiscing elit."
+ RenderBlock {P} at (5,573) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -182,8 +182,8 @@ layer at (8,1307) size 760x430
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,1753) size 760x430
- RenderBlock {DIV} at (0,1737) size 760x430 [border: (5px solid #800000)]
+layer at (8,1762) size 760x436
+ RenderBlock {DIV} at (0,1746) size 760x436 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x252
RenderInline {SPAN} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -204,24 +204,24 @@ layer at (8,1753) size 760x430
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,299) size 367x252
+ RenderBlock (anonymous) at (5,299) size 367x258
RenderInline {SPAN} at (0,0) size 46x21
RenderText {#text} at (0,0) size 46x21
text run at (0,0) width 46: "Lorem"
- RenderText {#text} at (46,0) size 367x252
+ RenderText {#text} at (46,0) size 367x258
text run at (46,0) width 305: " ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (5,567) size 367x252
+ text run at (0,132) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,153) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,174) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,195) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,216) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,237) width 184: "consectetuer adipiscing elit."
+ RenderBlock {P} at (5,573) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -235,9 +235,9 @@ layer at (8,1753) size 760x430
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
-layer at (8,2199) size 760x457
- RenderBlock {DIV} at (0,2183) size 760x457 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x252
+layer at (8,2214) size 760x452
+ RenderBlock {DIV} at (0,2198) size 760x452 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -251,34 +251,34 @@ layer at (8,2199) size 760x457
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (5,289) size 367x42
+ RenderBlock {P} at (5,273) size 367x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
- RenderBlock {P} at (5,347) size 367x252
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock {P} at (5,331) size 367x263
+ RenderText {#text} at (0,0) size 367x263
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,615) size 367x42
+ text run at (0,116) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,137) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,158) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,179) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,200) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,221) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,242) width 184: "consectetuer adipiscing elit."
+ RenderBlock (anonymous) at (5,610) size 367x42
RenderInline {SPAN} at (0,0) size 351x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 24: "elit."
- RenderBlock (anonymous) at (5,657) size 367x21
+ RenderBlock (anonymous) at (5,652) size 367x21
RenderBlock {SPAN} at (0,0) size 367x21
RenderText {#text} at (0,0) size 164x21
text run at (0,0) width 164: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,678) size 367x210
+ RenderBlock (anonymous) at (5,673) size 367x210
RenderInline {SPAN} at (0,0) size 357x210
RenderText {#text} at (0,0) size 357x210
text run at (0,0) width 315: "Curabitur sollicitudin felis quis lectus. Quisque"
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
index f4f3e5d..91ec0a1 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
@@ -1,16 +1,16 @@
-layer at (0,0) size 784x1562
+layer at (0,0) size 784x1598
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x1562
- RenderBlock {HTML} at (0,0) size 784x1562
- RenderBody {BODY} at (8,16) size 768x1530
-layer at (8,16) size 760x478
- RenderBlock {DIV} at (0,0) size 760x478 [border: (5px solid #800000)]
+layer at (0,0) size 784x1598
+ RenderBlock {HTML} at (0,0) size 784x1598
+ RenderBody {BODY} at (8,16) size 768x1566
+layer at (8,16) size 760x489
+ RenderBlock {DIV} at (0,0) size 760x489 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x31 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,90) size 750x399
- RenderBlock (anonymous multi-column) at (5,74) size 750x399
+layer at (13,90) size 750x410
+ RenderBlock (anonymous multi-column) at (5,74) size 750x410
RenderBlock {SPAN} at (0,0) size 367x252 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -25,48 +25,48 @@ layer at (13,90) size 750x399
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,268) size 367x525
- RenderText {#text} at (0,0) size 367x252
+ RenderBlock (anonymous) at (0,268) size 367x541
+ RenderText {#text} at (0,0) size 367x268
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 188: "consectetuer adipiscing elit. "
+ text run at (0,142) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,163) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,184) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,205) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,226) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,247) width 188: "consectetuer adipiscing elit. "
RenderInline {SPAN} at (0,0) size 46x21
- RenderText {#text} at (188,231) size 46x21
- text run at (188,231) width 46: "Lorem"
- RenderText {#text} at (234,231) size 359x294
- text run at (234,231) width 104: " ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 192: "elit. Nulla varius enim ac mi."
-layer at (8,510) size 760x478
- RenderBlock {DIV} at (0,494) size 760x478 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,423) size 750x31 [color=#FFFFFF]
+ RenderText {#text} at (188,247) size 46x21
+ text run at (188,247) width 46: "Lorem"
+ RenderText {#text} at (234,247) size 359x294
+ text run at (234,247) width 104: " ipsum dolor sit"
+ text run at (0,268) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,289) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,310) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,331) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,352) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,373) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,394) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,415) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,436) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,457) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,478) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,499) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,520) width 192: "elit. Nulla varius enim ac mi."
+layer at (8,521) size 760x489
+ RenderBlock {DIV} at (0,505) size 760x489 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,434) size 750x31 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,515) size 750x399
- RenderBlock (anonymous multi-column) at (5,5) size 750x399
- RenderBlock (anonymous) at (0,0) size 367x735
- RenderText {#text} at (0,0) size 367x735
+layer at (13,526) size 750x410
+ RenderBlock (anonymous multi-column) at (5,5) size 750x410
+ RenderBlock (anonymous) at (0,0) size 367x746
+ RenderText {#text} at (0,0) size 367x746
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -87,36 +87,36 @@ layer at (13,515) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 184: "consectetuer adipiscing elit."
- RenderBlock {SPAN} at (0,751) size 367x42 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,410) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,431) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,452) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,473) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,494) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,515) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,536) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,557) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,578) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,599) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,620) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,641) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,662) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,683) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,704) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,725) width 184: "consectetuer adipiscing elit."
+ RenderBlock {SPAN} at (0,762) size 367x42 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
-layer at (8,1004) size 760x542
- RenderBlock {DIV} at (0,988) size 760x542 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,203) size 750x31 [color=#FFFFFF]
+layer at (8,1026) size 760x556
+ RenderBlock {DIV} at (0,1010) size 760x556 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,209) size 750x31 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x32
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1025) size 750x163
- RenderBlock (anonymous multi-column) at (5,21) size 750x163
- RenderBlock {P} at (0,0) size 367x252
- RenderText {#text} at (0,0) size 367x252
+layer at (13,1047) size 750x169
+ RenderBlock (anonymous multi-column) at (5,21) size 750x169
+ RenderBlock {P} at (0,0) size 367x253
+ RenderText {#text} at (0,0) size 367x253
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -125,17 +125,17 @@ layer at (13,1025) size 750x163
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {SPAN} at (0,268) size 367x42 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,169) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,190) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,211) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,232) width 184: "consectetuer adipiscing elit."
+ RenderBlock {SPAN} at (0,269) size 367x42 [color=#FFFFFF] [bgcolor=#000000]
RenderBlock (anonymous) at (0,0) size 367x42
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
-layer at (13,1257) size 750x268
- RenderBlock (anonymous multi-column) at (5,253) size 750x268
+layer at (13,1285) size 750x276
+ RenderBlock (anonymous multi-column) at (5,259) size 750x276
RenderBlock {SPAN} at (0,0) size 367x252 [color=#FFFFFF] [bgcolor=#000000]
RenderBlock {P} at (0,0) size 367x252
RenderText {#text} at (0,0) size 367x252
@@ -151,7 +151,7 @@ layer at (13,1257) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,268) size 367x252
+ RenderBlock (anonymous) at (0,276) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -165,4 +165,4 @@ layer at (13,1257) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {P} at (0,536) size 367x0
+ RenderBlock {P} at (0,544) size 367x0
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt
index 9fd34b1..0e5013a 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt
@@ -1,16 +1,16 @@
-layer at (0,0) size 784x1530
+layer at (0,0) size 784x1542
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x1530
- RenderBlock {HTML} at (0,0) size 784x1530
- RenderBody {BODY} at (8,16) size 768x1498
-layer at (8,16) size 760x478
- RenderBlock {DIV} at (0,0) size 760x478 [border: (5px solid #800000)]
+layer at (0,0) size 784x1542
+ RenderBlock {HTML} at (0,0) size 784x1542
+ RenderBody {BODY} at (8,16) size 768x1510
+layer at (8,16) size 760x489
+ RenderBlock {DIV} at (0,0) size 760x489 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x31 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 664x32
text run at (0,0) width 664: "This is a spanning element at the beginning of the columns block."
-layer at (13,90) size 750x399
- RenderBlock (anonymous multi-column) at (5,74) size 750x399
+layer at (13,90) size 750x410
+ RenderBlock (anonymous multi-column) at (5,74) size 750x410
RenderBlock {SPAN} at (0,0) size 367x252 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -25,44 +25,44 @@ layer at (13,90) size 750x399
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,268) size 367x525
- RenderText {#text} at (0,0) size 367x525
+ RenderBlock (anonymous) at (0,268) size 367x541
+ RenderText {#text} at (0,0) size 367x541
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 188: "consectetuer adipiscing elit. "
- text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 192: "elit. Nulla varius enim ac mi."
-layer at (8,510) size 760x478
- RenderBlock {DIV} at (0,494) size 760x478 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,423) size 750x31 [color=#FFFFFF]
+ text run at (0,142) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,163) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,184) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,205) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,226) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,247) width 188: "consectetuer adipiscing elit. "
+ text run at (188,247) width 150: "Lorem ipsum dolor sit"
+ text run at (0,268) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,289) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,310) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,331) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,352) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,373) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,394) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,415) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,436) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,457) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,478) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,499) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,520) width 192: "elit. Nulla varius enim ac mi."
+layer at (8,521) size 760x489
+ RenderBlock {DIV} at (0,505) size 760x489 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,434) size 750x31 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 600x32
text run at (0,0) width 600: "This is a spanning element at the end of the columns block."
-layer at (13,515) size 750x399
- RenderBlock (anonymous multi-column) at (5,5) size 750x399
- RenderBlock (anonymous) at (0,0) size 367x483
- RenderText {#text} at (0,0) size 367x483
+layer at (13,526) size 750x410
+ RenderBlock (anonymous multi-column) at (5,5) size 750x410
+ RenderBlock (anonymous) at (0,0) size 367x494
+ RenderText {#text} at (0,0) size 367x494
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -83,11 +83,11 @@ layer at (13,515) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- RenderBlock {SPAN} at (0,499) size 367x294 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,410) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,431) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,452) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,473) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ RenderBlock {SPAN} at (0,510) size 367x294 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 367x294
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
@@ -104,16 +104,16 @@ layer at (13,515) size 750x399
text run at (188,231) width 150: "Lorem ipsum dolor sit"
text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
text run at (0,273) width 40: "ac mi."
-layer at (8,1004) size 760x510
- RenderBlock {DIV} at (0,988) size 760x510 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,187) size 750x31 [color=#FFFFFF]
+layer at (8,1026) size 760x500
+ RenderBlock {DIV} at (0,1010) size 760x500 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,193) size 750x31 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 634x32
text run at (0,0) width 634: "This is a spanning element in the middle of the columns block."
-layer at (13,1009) size 750x163
- RenderBlock (anonymous multi-column) at (5,5) size 750x163
- RenderBlock (anonymous) at (0,0) size 367x252
- RenderText {#text} at (0,0) size 367x252
+layer at (13,1031) size 750x169
+ RenderBlock (anonymous multi-column) at (5,5) size 750x169
+ RenderBlock (anonymous) at (0,0) size 367x253
+ RenderText {#text} at (0,0) size 367x253
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -122,16 +122,16 @@ layer at (13,1009) size 750x163
text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
text run at (0,126) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
text run at (0,147) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,168) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock {SPAN} at (0,268) size 367x42 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,169) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,190) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,211) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,232) width 184: "consectetuer adipiscing elit."
+ RenderBlock {SPAN} at (0,269) size 367x42 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 351x42
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 192: "elit. Nulla varius enim ac mi."
-layer at (13,1241) size 750x268
- RenderBlock (anonymous multi-column) at (5,237) size 750x268
+layer at (13,1269) size 750x252
+ RenderBlock (anonymous multi-column) at (5,243) size 750x252
RenderBlock {SPAN} at (0,0) size 367x252 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
@@ -146,7 +146,7 @@ layer at (13,1241) size 750x268
text run at (0,189) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 184: "consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,268) size 367x252
+ RenderBlock (anonymous) at (0,252) size 367x252
RenderText {#text} at (0,0) size 367x252
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-margin-collapsing-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-margin-collapsing-expected.txt
index fd23394..c428f8e 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-margin-collapsing-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-margin-collapsing-expected.txt
@@ -1,19 +1,19 @@
-layer at (0,0) size 784x2211
+layer at (0,0) size 784x2216
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x2211
- RenderBlock {HTML} at (0,0) size 784x2211
- RenderBody {BODY} at (8,19) size 768x2176
-layer at (8,19) size 750x480
- RenderBlock {DIV} at (0,0) size 750x480 [bgcolor=#EEEEEE]
+layer at (0,0) size 784x2216
+ RenderBlock {HTML} at (0,0) size 784x2216
+ RenderBody {BODY} at (8,19) size 768x2181
+layer at (8,19) size 750x481
+ RenderBlock {DIV} at (0,0) size 750x481 [bgcolor=#EEEEEE]
RenderBlock (anonymous multi-column span) at (0,0) size 750x62
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 687x63
text run at (0,0) width 670: "This is a spanning element at the beginning of the columns block. "
text run at (670,0) width 17: "It"
text run at (0,31) width 527: "should collapse its margins with the top of the page."
-layer at (8,100) size 750x399
- RenderBlock (anonymous multi-column) at (0,81) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (8,100) size 750x400
+ RenderBlock (anonymous multi-column) at (0,81) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -34,36 +34,36 @@ layer at (8,100) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,515) size 750x481
- RenderBlock {DIV} at (0,496) size 750x480 [bgcolor=#EEEEEE]
- RenderBlock (anonymous multi-column span) at (0,418) size 750x62
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,516) size 750x482
+ RenderBlock {DIV} at (0,497) size 750x481 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (0,419) size 750x62
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 696x63
text run at (0,0) width 606: "This is a spanning element at the end of the columns block. "
text run at (606,0) width 90: "It should"
text run at (0,31) width 504: "collapse its margins with the h2 in the next block."
-layer at (8,515) size 750x399
- RenderBlock (anonymous multi-column) at (0,0) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (8,516) size 750x400
+ RenderBlock (anonymous multi-column) at (0,0) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -84,36 +84,36 @@ layer at (8,515) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,1014) size 750x480
- RenderBlock {DIV} at (0,995) size 750x480 [bgcolor=#EEEEEE]
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,1016) size 750x481
+ RenderBlock {DIV} at (0,997) size 750x481 [bgcolor=#EEEEEE]
RenderBlock (anonymous multi-column span) at (0,0) size 750x62
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 687x63
text run at (0,0) width 670: "This is a spanning element at the beginning of the columns block. "
text run at (670,0) width 17: "It"
text run at (0,31) width 621: "should collapse its margins with the h2 in the previous block."
-layer at (8,1095) size 750x399
- RenderBlock (anonymous multi-column) at (0,81) size 750x399
- RenderText {#text} at (0,0) size 367x777
+layer at (8,1097) size 750x400
+ RenderBlock (anonymous multi-column) at (0,81) size 750x400
+ RenderText {#text} at (0,0) size 367x778
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -134,28 +134,28 @@ layer at (8,1095) size 750x399
text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,483) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,504) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
- text run at (0,525) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
- text run at (0,546) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
- text run at (0,567) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,588) width 315: "convallis adipiscing sem. Nam nonummy enim."
- text run at (0,609) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,630) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
- text run at (0,651) width 326: "nulla. Phasellus eget ante et tortor condimentum"
- text run at (0,672) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
- text run at (0,693) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
- text run at (0,714) width 188: "consectetuer adipiscing elit. "
- text run at (188,714) width 150: "Lorem ipsum dolor sit"
- text run at (0,735) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,756) width 40: "ac mi."
-layer at (8,1510) size 750x685
- RenderBlock {DIV} at (0,1491) size 750x685 [bgcolor=#EEEEEE]
- RenderBlock (anonymous multi-column span) at (0,271) size 750x143
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,484) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+ text run at (0,505) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+ text run at (0,526) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+ text run at (0,547) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+ text run at (0,568) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,589) width 315: "convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,610) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,631) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+ text run at (0,652) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+ text run at (0,673) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+ text run at (0,694) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+ text run at (0,715) width 188: "consectetuer adipiscing elit. "
+ text run at (188,715) width 150: "Lorem ipsum dolor sit"
+ text run at (0,736) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,757) width 40: "ac mi."
+layer at (8,1513) size 750x687
+ RenderBlock {DIV} at (0,1494) size 750x687 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (0,272) size 750x143
RenderBlock {H2} at (0,0) size 750x62 [bgcolor=#CCCCCC]
RenderText {#text} at (0,0) size 730x63
text run at (0,0) width 640: "This is a spanning element in the middle of the columns block. "
@@ -166,9 +166,9 @@ layer at (8,1510) size 750x685
text run at (0,0) width 640: "This is a spanning element in the middle of the columns block. "
text run at (640,0) width 90: "It should"
text run at (0,31) width 569: "collapse its margins with the spanning element above it."
-layer at (8,1510) size 750x252
- RenderBlock (anonymous multi-column) at (0,0) size 750x252
- RenderText {#text} at (0,0) size 367x483
+layer at (8,1513) size 750x253
+ RenderBlock (anonymous multi-column) at (0,0) size 750x253
+ RenderText {#text} at (0,0) size 367x484
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -182,20 +182,20 @@ layer at (8,1510) size 750x252
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 188: "consectetuer adipiscing elit. "
text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
-layer at (8,1943) size 750x252
- RenderBlock (anonymous multi-column) at (0,433) size 750x252
- RenderText {#text} at (0,0) size 367x483
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,295) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,316) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,337) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,358) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,379) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+layer at (8,1947) size 750x253
+ RenderBlock (anonymous multi-column) at (0,434) size 750x253
+ RenderText {#text} at (0,0) size 367x484
text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
@@ -209,14 +209,14 @@ layer at (8,1943) size 750x252
text run at (0,210) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
text run at (0,231) width 188: "consectetuer adipiscing elit. "
text run at (188,231) width 150: "Lorem ipsum dolor sit"
- text run at (0,252) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
- text run at (0,273) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,294) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,315) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
- text run at (0,336) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
- text run at (0,357) width 341: "nonummy enim. Nullam bibendum lobortis neque."
- text run at (0,378) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (0,399) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,420) width 328: "condimentum vestibulum. Suspendisse hendrerit"
- text run at (0,441) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
- text run at (0,462) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,253) width 349: "amet, consectetuer adipiscing elit. Nulla varius enim"
+ text run at (0,274) width 359: "ac mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,295) width 357: "adipiscing rhoncus sem. Proin nulla purus, vulputate"
+ text run at (0,316) width 350: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci"
+ text run at (0,337) width 351: "sagittis aliquam. Cras convallis adipiscing sem. Nam"
+ text run at (0,358) width 341: "nonummy enim. Nullam bibendum lobortis neque."
+ text run at (0,379) width 355: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (0,400) width 336: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,421) width 328: "condimentum vestibulum. Suspendisse hendrerit"
+ text run at (0,442) width 345: "quam nec felis. Sed varius turpis vitae pede. Lorem"
+ text run at (0,463) width 329: "ipsum dolor sit amet, consectetuer adipiscing elit."
diff --git a/LayoutTests/platform/qt/fast/repaint/multicol-repaint-expected.txt b/LayoutTests/platform/qt/fast/repaint/multicol-repaint-expected.txt
index 344ef9a..eba5c4e 100644
--- a/LayoutTests/platform/qt/fast/repaint/multicol-repaint-expected.txt
+++ b/LayoutTests/platform/qt/fast/repaint/multicol-repaint-expected.txt
@@ -9,6 +9,6 @@ layer at (8,8) size 402x102
text run at (1,1) width 13: " "
RenderBR {BR} at (14,1) size 0x65
RenderInline {SPAN} at (0,0) size 300x49
- RenderText {#text} at (1,74) size 300x49
- text run at (1,74) width 300: "XXXXXX"
+ RenderText {#text} at (1,109) size 300x49
+ text run at (1,109) width 300: "XXXXXX"
RenderText {#text} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list