[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 13:29:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 123ca730703678957c093e5e29e0ac7a2aa72ed4
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 16 21:39:43 2010 +0000
2010-09-16 Martin Robinson <mrobinson at igalia.com>
Update baselines for GTK+ and unskip a test which is passing.
* platform/gtk/Skipped: Update baselines for GTK+.
* platform/gtk/fast/css/percent-top-relative-container-height-unspecified-expected.txt: Added.
* platform/gtk/fast/images/gif-large-checkerboard-expected.txt: Added.
* platform/gtk/fast/multicol/border-padding-pagination-expected.txt: Added.
* platform/gtk/fast/multicol/client-rects-expected.txt: Added.
* platform/gtk/fast/multicol/column-break-with-balancing-expected.txt: Added.
* platform/gtk/fast/multicol/column-rules-expected.txt: Added.
* platform/gtk/fast/multicol/column-rules-stacking-expected.txt: Added.
* platform/gtk/fast/multicol/columns-shorthand-parsing-expected.txt: Added.
* platform/gtk/fast/multicol/float-avoidance-expected.txt: Added.
* platform/gtk/fast/multicol/float-multicol-expected.txt: Added.
* platform/gtk/fast/multicol/float-paginate-complex-expected.txt: Added.
* platform/gtk/fast/multicol/float-paginate-expected.txt: Added.
* platform/gtk/fast/multicol/layers-in-multicol-expected.txt:
* platform/gtk/fast/multicol/margin-collapse-expected.txt: Added.
* platform/gtk/fast/multicol/max-height-columns-block-expected.txt: Added.
* platform/gtk/fast/multicol/nested-columns-expected.txt:
* platform/gtk/fast/multicol/paginate-block-replaced-expected.txt: Added.
* platform/gtk/fast/multicol/positioned-split-expected.txt: Added.
* platform/gtk/fast/multicol/positioned-with-constrained-height-expected.txt: Added.
* platform/gtk/fast/multicol/shadow-breaking-expected.txt: Added.
* platform/gtk/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt:
* platform/gtk/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt:
* platform/gtk/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt:
* platform/gtk/fast/multicol/span/span-as-immediate-columns-child-expected.txt:
* platform/gtk/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt:
* platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt:
* platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt:
* platform/gtk/fast/multicol/table-margin-collapse-expected.txt: Added.
* platform/gtk/fast/multicol/table-vertical-align-expected.txt: Added.
* platform/gtk/fast/multicol/unsplittable-inline-block-expected.txt: Added.
* platform/gtk/fast/repaint/block-layout-inline-children-float-positioned-expected.txt: Added.
* platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt: Added.
* platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt: Added.
* platform/gtk/svg/css/composite-shadow-with-opacity-expected.txt: Added.
* platform/gtk/svg/css/shadow-changes-expected.txt: Added.
* platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-expected.txt: Added.
* platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.txt: Added.
* platform/gtk/svg/custom/getscreenctm-in-scrollable-svg-area-expected.txt: Added.
* platform/gtk/svg/custom/mouse-move-on-svg-container-expected.txt: Added.
* platform/gtk/svg/custom/mouse-move-on-svg-container-standalone-expected.txt: Added.
* platform/gtk/svg/custom/mouse-move-on-svg-root-expected.txt: Added.
* platform/gtk/svg/custom/mouse-move-on-svg-root-standalone-expected.txt: Added.
* platform/gtk/svg/custom/non-scaling-stroke-markers-expected.txt: Copied from LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt.
* platform/gtk/svg/custom/use-invalid-pattern-expected.txt: Copied from LayoutTests/platform/mac-snowleopard/svg/custom/use-invalid-pattern-expected.txt.
* platform/gtk/svg/repaint/filter-repaint-expected.txt: Added.
* platform/gtk/transitions/svg-text-shadow-transition-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67668 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fa11822..a0a8e84 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,55 @@
+2010-09-16 Martin Robinson <mrobinson at igalia.com>
+
+ Update baselines for GTK+ and unskip a test which is passing.
+
+ * platform/gtk/Skipped: Update baselines for GTK+.
+ * platform/gtk/fast/css/percent-top-relative-container-height-unspecified-expected.txt: Added.
+ * platform/gtk/fast/images/gif-large-checkerboard-expected.txt: Added.
+ * platform/gtk/fast/multicol/border-padding-pagination-expected.txt: Added.
+ * platform/gtk/fast/multicol/client-rects-expected.txt: Added.
+ * platform/gtk/fast/multicol/column-break-with-balancing-expected.txt: Added.
+ * platform/gtk/fast/multicol/column-rules-expected.txt: Added.
+ * platform/gtk/fast/multicol/column-rules-stacking-expected.txt: Added.
+ * platform/gtk/fast/multicol/columns-shorthand-parsing-expected.txt: Added.
+ * platform/gtk/fast/multicol/float-avoidance-expected.txt: Added.
+ * platform/gtk/fast/multicol/float-multicol-expected.txt: Added.
+ * platform/gtk/fast/multicol/float-paginate-complex-expected.txt: Added.
+ * platform/gtk/fast/multicol/float-paginate-expected.txt: Added.
+ * platform/gtk/fast/multicol/layers-in-multicol-expected.txt:
+ * platform/gtk/fast/multicol/margin-collapse-expected.txt: Added.
+ * platform/gtk/fast/multicol/max-height-columns-block-expected.txt: Added.
+ * platform/gtk/fast/multicol/nested-columns-expected.txt:
+ * platform/gtk/fast/multicol/paginate-block-replaced-expected.txt: Added.
+ * platform/gtk/fast/multicol/positioned-split-expected.txt: Added.
+ * platform/gtk/fast/multicol/positioned-with-constrained-height-expected.txt: Added.
+ * platform/gtk/fast/multicol/shadow-breaking-expected.txt: Added.
+ * platform/gtk/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-immediate-columns-child-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt:
+ * platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+ * platform/gtk/fast/multicol/table-margin-collapse-expected.txt: Added.
+ * platform/gtk/fast/multicol/table-vertical-align-expected.txt: Added.
+ * platform/gtk/fast/multicol/unsplittable-inline-block-expected.txt: Added.
+ * platform/gtk/fast/repaint/block-layout-inline-children-float-positioned-expected.txt: Added.
+ * platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt: Added.
+ * platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt: Added.
+ * platform/gtk/svg/css/composite-shadow-with-opacity-expected.txt: Added.
+ * platform/gtk/svg/css/shadow-changes-expected.txt: Added.
+ * platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-expected.txt: Added.
+ * platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.txt: Added.
+ * platform/gtk/svg/custom/getscreenctm-in-scrollable-svg-area-expected.txt: Added.
+ * platform/gtk/svg/custom/mouse-move-on-svg-container-expected.txt: Added.
+ * platform/gtk/svg/custom/mouse-move-on-svg-container-standalone-expected.txt: Added.
+ * platform/gtk/svg/custom/mouse-move-on-svg-root-expected.txt: Added.
+ * platform/gtk/svg/custom/mouse-move-on-svg-root-standalone-expected.txt: Added.
+ * platform/gtk/svg/custom/non-scaling-stroke-markers-expected.txt: Copied from LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt.
+ * platform/gtk/svg/custom/use-invalid-pattern-expected.txt: Copied from LayoutTests/platform/mac-snowleopard/svg/custom/use-invalid-pattern-expected.txt.
+ * platform/gtk/svg/repaint/filter-repaint-expected.txt: Added.
+ * platform/gtk/transitions/svg-text-shadow-transition-expected.txt: Added.
+
2010-09-16 takano takumi <takano1 at asia.apple.com>
Reviewed by Dave Hyatt.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 80c6ad1..a08e41d 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -2337,11 +2337,6 @@ fast/media/mq-width-absolute-02.html
fast/media/mq-width-absolute-03.html
fast/media/mq-width-absolute-04.html
fast/media/viewport-media-query.html
-fast/multicol/column-rules-stacking.html
-fast/multicol/column-rules.html
-fast/multicol/columns-shorthand-parsing.html
-fast/multicol/float-avoidance.html
-fast/multicol/float-multicol.html
fast/overflow/001.html
fast/overflow/002.html
fast/overflow/003.xml
@@ -4994,7 +4989,6 @@ fast/forms/basic-inputs.html
fast/forms/menulist-style-color.html
fast/forms/search-vertical-alignment.html
fast/forms/text-style-color.html
-fast/multicol/positioned-with-constrained-height.html
fast/overflow/overflow-with-local-background-attachment.html
fast/overflow/position-fixed-transform-clipping.html
fast/repaint/background-generated.html
@@ -5281,10 +5275,6 @@ fast/loader/loadInProgress.html
fast/loader/api-test-new-window-data-load-base-url.html
fast/loader/api-test-go-to-current-back-forward-item.html
-# Draws squares in a totally wrong fashion
-# See https://bugs.webkit.org/show_bug.cgi?id=35127
-fast/multicol/client-rects.html
-
# Failure may be related to DRT; console message also has full file
# path instead of just the file name
# See https://bugs.webkit.org/show_bug.cgi?id=35086
diff --git a/LayoutTests/platform/gtk/fast/css/percent-top-relative-container-height-unspecified-expected.txt b/LayoutTests/platform/gtk/fast/css/percent-top-relative-container-height-unspecified-expected.txt
new file mode 100644
index 0000000..1823422
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/css/percent-top-relative-container-height-unspecified-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 784x22 [border: (1px solid #FF0000)]
+ RenderBlock {DIV} at (0,22) size 784x22 [border: (1px solid #FF0000)]
+layer at (9,9) size 782x20
+ RenderBlock (relative positioned) {DIV} at (1,1) size 782x20
+ RenderText {#text} at (0,0) size 603x20
+ text run at (0,0) width 603: "This text with top percent relative and containing block auto should appear inside the red border"
+layer at (9,31) size 782x20
+ RenderBlock (relative positioned) {DIV} at (1,1) size 782x20
+ RenderText {#text} at (0,0) size 627x20
+ text run at (0,0) width 627: "This text with bottom percent relative and containing block auto should appear inside the red border"
diff --git a/LayoutTests/platform/gtk/fast/images/gif-large-checkerboard-expected.txt b/LayoutTests/platform/gtk/fast/images/gif-large-checkerboard-expected.txt
new file mode 100644
index 0000000..529a820
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/images/gif-large-checkerboard-expected.txt
@@ -0,0 +1,7 @@
+layer at (0,0) size 1599x2090
+ RenderView at (0,0) size 781x581
+layer at (0,0) size 1599x2090
+ RenderBlock {HTML} at (0,0) size 781x2090
+ RenderBody {BODY} at (8,8) size 765x2074
+ RenderImage {IMG} at (0,0) size 1591x2074
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/border-padding-pagination-expected.txt b/LayoutTests/platform/gtk/fast/multicol/border-padding-pagination-expected.txt
new file mode 100644
index 0000000..2d4d8f5
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/border-padding-pagination-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+layer at (8,8) size 784x182
+ RenderBlock {DIV} at (0,0) size 784x182 [border: (2px solid #800000)]
+ RenderBlock {DIV} at (2,2) size 382x110
+ RenderBlock {DIV} at (2,180) size 379x164 [bgcolor=#00FF00] [border: (2px solid #000000)]
+ RenderBlock {DIV} at (12,2) size 355x160 [bgcolor=#008000] [border: (2px solid #0000FF)]
+ RenderInline {SPAN} at (0,0) size 192x156
+ RenderText {#text} at (2,2) size 192x156
+ text run at (2,2) width 165: "In 2nd"
+ text run at (2,80) width 192: "column"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/client-rects-expected.txt b/LayoutTests/platform/gtk/fast/multicol/client-rects-expected.txt
new file mode 100644
index 0000000..7ddd247
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/client-rects-expected.txt
@@ -0,0 +1,102 @@
+layer at (0,0) size 781x698
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x698
+ RenderBlock {HTML} at (0,0) size 781x698
+ RenderBody {BODY} at (8,8) size 765x680
+ RenderBlock {P} at (0,0) size 765x30
+ RenderText {#text} at (0,10) size 421x20
+ text run at (0,10) width 421: "The blue borders should coincide with light blue squares, like this: "
+ RenderBlock {SPAN} at (421,0) size 25x25 [bgcolor=#ADD8E6] [border: (3px solid #0000FF7F)]
+ RenderText {#text} at (446,10) size 196x20
+ text run at (446,10) width 8: ". "
+ text run at (454,10) width 188: "There should be none of this: "
+ RenderBlock {SPAN} at (642,0) size 25x25 [bgcolor=#ADD8E6]
+ RenderText {#text} at (667,10) size 51x20
+ text run at (667,10) width 4: " "
+ text run at (671,10) width 47: "or this: "
+ RenderBlock {SPAN} at (718,0) size 25x25 [border: (3px solid #0000FF7F)]
+ RenderText {#text} at (743,10) size 4x20
+ text run at (743,10) width 4: "."
+ RenderBlock {P} at (0,568) size 765x20
+ RenderText {#text} at (0,0) size 633x20
+ text run at (0,0) width 633: "Except here, where the blue border should be around the bigger slice of the blue square, on the right."
+layer at (8,54) size 136x76
+ RenderBlock {DIV} at (0,46) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (13,13) size 0x25
+ RenderText {#text} at (13,38) size 25x75
+ text run at (13,38) width 25: "x"
+ text run at (13,63) width 25: "y"
+ text run at (13,88) width 25: "z"
+layer at (8,140) size 136x76
+ RenderBlock {DIV} at (0,132) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (13,13) size 0x25
+ RenderInline {SPAN} at (0,0) size 25x75
+ RenderText {#text} at (13,38) size 25x75
+ text run at (13,38) width 25: "x"
+ text run at (13,63) width 25: "y"
+ text run at (13,88) width 25: "z"
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,226) size 136x76
+ RenderBlock {DIV} at (0,218) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (13,13) size 50x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (13,38) size 50x75
+ RenderText {#text} at (0,0) size 25x75
+ text run at (0,0) width 25: "x"
+ text run at (0,25) width 25: "y"
+ text run at (0,50) width 25: "z"
+layer at (8,312) size 136x76
+ RenderBlock {DIV} at (0,304) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (13,13) size 50x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (13,38) size 50x75
+ RenderBR {BR} at (0,0) size 0x25
+ RenderText {#text} at (0,25) size 25x50
+ text run at (0,25) width 25: "y"
+ text run at (0,50) width 25: "z"
+layer at (8,398) size 136x76
+ RenderBlock {DIV} at (0,390) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (13,13) size 50x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (13,38) size 50x54
+ RenderBR {BR} at (0,0) size 0x25
+ RenderSlider {INPUT} at (2,27) size 25x25 [color=#000000] [bgcolor=#ADD8E6]
+ RenderBlock {DIV} at (12,12) size 0x0
+layer at (8,484) size 136x76
+ RenderBlock {DIV} at (0,476) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (13,13) size 50x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (13,38) size 50x50
+ RenderBR {BR} at (0,0) size 0x25
+ RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
+layer at (8,612) size 136x76
+ RenderBlock {DIV} at (0,604) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (13,13) size 25x25 [bgcolor=#ADD8E6]
+layer at (21,92) size 25x25
+ RenderBlock (positioned) {DIV} at (21,92) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,67) size 25x25
+ RenderBlock (positioned) {DIV} at (81,67) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,92) size 25x25
+ RenderBlock (positioned) {DIV} at (81,92) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,178) size 25x25
+ RenderBlock (positioned) {DIV} at (21,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,153) size 25x25
+ RenderBlock (positioned) {DIV} at (81,153) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,178) size 25x25
+ RenderBlock (positioned) {DIV} at (81,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,264) size 25x25
+ RenderBlock (positioned) {DIV} at (21,264) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,239) size 25x25
+ RenderBlock (positioned) {DIV} at (81,239) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,264) size 25x25
+ RenderBlock (positioned) {DIV} at (81,264) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,325) size 25x25
+ RenderBlock (positioned) {DIV} at (81,325) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,350) size 25x25
+ RenderBlock (positioned) {DIV} at (81,350) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (83,413) size 25x25
+ RenderBlock (positioned) {DIV} at (83,413) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,497) size 25x25
+ RenderBlock (positioned) {DIV} at (81,497) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,625) size 25x25
+ RenderBlock (positioned) {DIV} at (21,625) size 25x25 [border: (3px solid #0000FF7F)]
diff --git a/LayoutTests/platform/gtk/fast/multicol/column-break-with-balancing-expected.txt b/LayoutTests/platform/gtk/fast/multicol/column-break-with-balancing-expected.txt
new file mode 100644
index 0000000..b6282c9
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/column-break-with-balancing-expected.txt
@@ -0,0 +1,163 @@
+layer at (0,0) size 781x892
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x892
+ RenderBlock {HTML} at (0,0) size 781x892
+ RenderBody {BODY} at (8,8) size 765x876
+layer at (8,8) size 765x430
+ RenderBlock {DIV} at (0,0) size 765x430 [border: (5px solid #0000FF)]
+ RenderBlock (anonymous) at (5,5) size 369x420
+ RenderText {#text} at (0,0) size 110x20
+ text run at (0,0) width 110: "This is some text."
+ RenderBR {BR} at (110,15) size 0x0
+ RenderText {#text} at (0,20) size 110x20
+ text run at (0,20) width 110: "This is some text."
+ RenderBR {BR} at (110,35) size 0x0
+ RenderText {#text} at (0,40) size 110x20
+ text run at (0,40) width 110: "This is some text."
+ RenderBR {BR} at (110,55) size 0x0
+ RenderText {#text} at (0,60) size 110x20
+ text run at (0,60) width 110: "This is some text."
+ RenderBR {BR} at (110,75) size 0x0
+ RenderText {#text} at (0,80) size 110x20
+ text run at (0,80) width 110: "This is some text."
+ RenderBR {BR} at (110,95) size 0x0
+ RenderText {#text} at (0,100) size 110x20
+ text run at (0,100) width 110: "This is some text."
+ RenderBR {BR} at (110,115) size 0x0
+ RenderText {#text} at (0,120) size 110x20
+ text run at (0,120) width 110: "This is some text."
+ RenderBR {BR} at (110,135) size 0x0
+ RenderText {#text} at (0,140) size 110x20
+ text run at (0,140) width 110: "This is some text."
+ RenderBR {BR} at (110,155) size 0x0
+ RenderText {#text} at (0,160) size 110x20
+ text run at (0,160) width 110: "This is some text."
+ RenderBR {BR} at (110,175) size 0x0
+ RenderText {#text} at (0,180) size 110x20
+ text run at (0,180) width 110: "This is some text."
+ RenderBR {BR} at (110,195) size 0x0
+ RenderText {#text} at (0,200) size 110x20
+ text run at (0,200) width 110: "This is some text."
+ RenderBR {BR} at (110,215) size 0x0
+ RenderText {#text} at (0,220) size 110x20
+ text run at (0,220) width 110: "This is some text."
+ RenderBR {BR} at (110,235) size 0x0
+ RenderText {#text} at (0,240) size 110x20
+ text run at (0,240) width 110: "This is some text."
+ RenderBR {BR} at (110,255) size 0x0
+ RenderText {#text} at (0,260) size 110x20
+ text run at (0,260) width 110: "This is some text."
+ RenderBR {BR} at (110,275) size 0x0
+ RenderText {#text} at (0,280) size 110x20
+ text run at (0,280) width 110: "This is some text."
+ RenderBR {BR} at (110,295) size 0x0
+ RenderText {#text} at (0,300) size 110x20
+ text run at (0,300) width 110: "This is some text."
+ RenderBR {BR} at (110,315) size 0x0
+ RenderText {#text} at (0,320) size 110x20
+ text run at (0,320) width 110: "This is some text."
+ RenderBR {BR} at (110,335) size 0x0
+ RenderText {#text} at (0,340) size 110x20
+ text run at (0,340) width 110: "This is some text."
+ RenderBR {BR} at (110,355) size 0x0
+ RenderText {#text} at (0,360) size 110x20
+ text run at (0,360) width 110: "This is some text."
+ RenderBR {BR} at (110,375) size 0x0
+ RenderText {#text} at (0,380) size 110x20
+ text run at (0,380) width 110: "This is some text."
+ RenderBR {BR} at (110,395) size 0x0
+ RenderText {#text} at (0,400) size 110x20
+ text run at (0,400) width 110: "This is some text."
+ RenderBR {BR} at (110,415) size 0x0
+ RenderBlock {DIV} at (5,425) size 369x80
+ RenderText {#text} at (0,0) size 262x20
+ text run at (0,0) width 262: "This text should be in the second column."
+ RenderBR {BR} at (262,15) size 0x0
+ RenderText {#text} at (0,20) size 262x20
+ text run at (0,20) width 262: "This text should be in the second column."
+ RenderBR {BR} at (262,35) size 0x0
+ RenderText {#text} at (0,40) size 262x20
+ text run at (0,40) width 262: "This text should be in the second column."
+ RenderBR {BR} at (262,55) size 0x0
+ RenderText {#text} at (0,60) size 262x20
+ text run at (0,60) width 262: "This text should be in the second column."
+ RenderBR {BR} at (262,75) size 0x0
+layer at (8,454) size 765x430
+ RenderBlock {DIV} at (0,446) size 765x430 [border: (5px solid #0000FF)]
+ RenderBlock (anonymous) at (5,5) size 369x80
+ RenderText {#text} at (0,0) size 242x20
+ text run at (0,0) width 242: "This text should be in the first column."
+ RenderBR {BR} at (242,15) size 0x0
+ RenderText {#text} at (0,20) size 242x20
+ text run at (0,20) width 242: "This text should be in the first column."
+ RenderBR {BR} at (242,35) size 0x0
+ RenderText {#text} at (0,40) size 242x20
+ text run at (0,40) width 242: "This text should be in the first column."
+ RenderBR {BR} at (242,55) size 0x0
+ RenderText {#text} at (0,60) size 242x20
+ text run at (0,60) width 242: "This text should be in the first column."
+ RenderBR {BR} at (242,75) size 0x0
+ RenderBlock {DIV} at (5,425) size 369x420
+ RenderText {#text} at (0,0) size 110x20
+ text run at (0,0) width 110: "This is some text."
+ RenderBR {BR} at (110,15) size 0x0
+ RenderText {#text} at (0,20) size 110x20
+ text run at (0,20) width 110: "This is some text."
+ RenderBR {BR} at (110,35) size 0x0
+ RenderText {#text} at (0,40) size 110x20
+ text run at (0,40) width 110: "This is some text."
+ RenderBR {BR} at (110,55) size 0x0
+ RenderText {#text} at (0,60) size 110x20
+ text run at (0,60) width 110: "This is some text."
+ RenderBR {BR} at (110,75) size 0x0
+ RenderText {#text} at (0,80) size 110x20
+ text run at (0,80) width 110: "This is some text."
+ RenderBR {BR} at (110,95) size 0x0
+ RenderText {#text} at (0,100) size 110x20
+ text run at (0,100) width 110: "This is some text."
+ RenderBR {BR} at (110,115) size 0x0
+ RenderText {#text} at (0,120) size 110x20
+ text run at (0,120) width 110: "This is some text."
+ RenderBR {BR} at (110,135) size 0x0
+ RenderText {#text} at (0,140) size 110x20
+ text run at (0,140) width 110: "This is some text."
+ RenderBR {BR} at (110,155) size 0x0
+ RenderText {#text} at (0,160) size 110x20
+ text run at (0,160) width 110: "This is some text."
+ RenderBR {BR} at (110,175) size 0x0
+ RenderText {#text} at (0,180) size 110x20
+ text run at (0,180) width 110: "This is some text."
+ RenderBR {BR} at (110,195) size 0x0
+ RenderText {#text} at (0,200) size 110x20
+ text run at (0,200) width 110: "This is some text."
+ RenderBR {BR} at (110,215) size 0x0
+ RenderText {#text} at (0,220) size 110x20
+ text run at (0,220) width 110: "This is some text."
+ RenderBR {BR} at (110,235) size 0x0
+ RenderText {#text} at (0,240) size 110x20
+ text run at (0,240) width 110: "This is some text."
+ RenderBR {BR} at (110,255) size 0x0
+ RenderText {#text} at (0,260) size 110x20
+ text run at (0,260) width 110: "This is some text."
+ RenderBR {BR} at (110,275) size 0x0
+ RenderText {#text} at (0,280) size 110x20
+ text run at (0,280) width 110: "This is some text."
+ RenderBR {BR} at (110,295) size 0x0
+ RenderText {#text} at (0,300) size 110x20
+ text run at (0,300) width 110: "This is some text."
+ RenderBR {BR} at (110,315) size 0x0
+ RenderText {#text} at (0,320) size 110x20
+ text run at (0,320) width 110: "This is some text."
+ RenderBR {BR} at (110,335) size 0x0
+ RenderText {#text} at (0,340) size 110x20
+ text run at (0,340) width 110: "This is some text."
+ RenderBR {BR} at (110,355) size 0x0
+ RenderText {#text} at (0,360) size 110x20
+ text run at (0,360) width 110: "This is some text."
+ RenderBR {BR} at (110,375) size 0x0
+ RenderText {#text} at (0,380) size 110x20
+ text run at (0,380) width 110: "This is some text."
+ RenderBR {BR} at (110,395) size 0x0
+ RenderText {#text} at (0,400) size 110x20
+ text run at (0,400) width 110: "This is some text."
+ RenderBR {BR} at (110,415) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/column-rules-expected.txt b/LayoutTests/platform/gtk/fast/multicol/column-rules-expected.txt
new file mode 100644
index 0000000..ca7f9e4
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/column-rules-expected.txt
@@ -0,0 +1,97 @@
+layer at (0,0) size 781x634
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x634
+ RenderBlock {HTML} at (0,0) size 781x634
+ RenderBody {BODY} at (8,8) size 765x618
+layer at (8,8) size 765x618
+ RenderBlock {DIV} at (0,0) size 765x618 [border: (5px solid #000000)]
+ RenderText {#text} at (15,5) size 234x1796
+ text run at (15,5) width 177: "Lorem ipsum dolor sit amet,"
+ text run at (15,25) width 212: "consectetuer adipiscing elit. Nulla"
+ text run at (15,45) width 179: "varius enim ac mi. Curabitur"
+ text run at (15,65) width 230: "sollicitudin felis quis lectus. Quisque"
+ text run at (15,85) width 224: "adipiscing rhoncus sem. Proin nulla"
+ text run at (15,105) width 190: "purus, vulputate vel, varius ut,"
+ text run at (15,125) width 217: "euismod et, nisi. Sed vitae felis vel"
+ text run at (15,145) width 222: "orci sagittis aliquam. Cras convallis"
+ text run at (15,165) width 200: "adipiscing sem. Nam nonummy"
+ text run at (15,185) width 204: "enim. Nullam bibendum lobortis"
+ text run at (15,205) width 231: "neque. Vestibulum velit orci, tempus"
+ text run at (15,225) width 203: "euismod, pretium quis, interdum"
+ text run at (15,245) width 211: "vitae, nulla. Phasellus eget ante et"
+ text run at (15,265) width 201: "tortor condimentum vestibulum."
+ text run at (15,285) width 202: "Suspendisse hendrerit quam nec"
+ text run at (15,305) width 211: "felis. Sed varius turpis vitae pede."
+ text run at (15,325) width 177: "Lorem ipsum dolor sit amet,"
+ text run at (15,345) width 211: "consectetuer adipiscing elit. Proin"
+ text run at (15,365) width 234: "bibendum justo ac enim. Class aptent"
+ text run at (15,385) width 224: "taciti sociosqu ad litora torquent per"
+ text run at (15,405) width 176: "conubia nostra, per inceptos"
+ text run at (15,425) width 234: "hymenaeos. Sed leo nulla, rutrum eu,"
+ text run at (15,445) width 213: "dictum ut, posuere vel, arcu. Nam"
+ text run at (15,465) width 182: "libero. Morbi orci. Maecenas"
+ text run at (15,485) width 204: "pellentesque. Curabitur erat erat,"
+ text run at (15,505) width 227: "ullamcorper at, gravida vitae, iaculis"
+ text run at (15,525) width 212: "vitae, elit. Nullam quam. Quisque"
+ text run at (15,545) width 233: "orci lectus, ullamcorper eu, imperdiet"
+ text run at (15,565) width 222: "sed, accumsan et, ligula. Duis diam"
+ text run at (15,585) width 194: "nisl, sagittis a, blandit volutpat,"
+ text run at (15,613) width 197: "interdum sed, velit. Vestibulum"
+ text run at (15,633) width 195: "quam. Nulla a purus. Phasellus"
+ text run at (15,653) width 177: "semper semper lectus. Nulla"
+ text run at (15,673) width 211: "porttitor, dolor dictum scelerisque"
+ text run at (15,693) width 233: "luctus, velit ipsum lobortis mauris, ac"
+ text run at (15,713) width 216: "pretium enim nunc vel risus. Proin"
+ text run at (15,733) width 201: "gravida mi ut sem cursus mattis."
+ text run at (15,753) width 184: "Fusce laoreet, nisi quis luctus"
+ text run at (15,773) width 218: "volutpat, arcu pede tincidunt enim,"
+ text run at (15,793) width 208: "nec malesuada urna nisl eu enim."
+ text run at (15,813) width 202: "Vivamus varius augue ac purus."
+ text run at (15,833) width 228: "Vestibulum vestibulum. Phasellus et"
+ text run at (15,853) width 205: "est vitae ante accumsan rhoncus."
+ text run at (15,873) width 209: "Morbi convallis, arcu at hendrerit"
+ text run at (15,893) width 216: "gravida, sem diam dignissim risus,"
+ text run at (15,913) width 193: "sed aliquet erat mi ut mi. Nunc"
+ text run at (15,933) width 181: "cursus lacinia elit. Nunc nisi."
+ text run at (15,953) width 223: "Quisque at erat. Vestibulum dictum"
+ text run at (15,973) width 208: "quam vitae nibh. Nunc vitae ante"
+ text run at (15,993) width 231: "non odio interdum blandit. Curabitur"
+ text run at (15,1013) width 230: "leo quam, fermentum sed, feugiat in,"
+ text run at (15,1033) width 230: "ullamcorper id, nibh. Suspendisse ac"
+ text run at (15,1053) width 201: "turpis. In iaculis sollicitudin dui."
+ text run at (15,1073) width 192: "Aenean vitae lectus vitae nulla"
+ text run at (15,1093) width 194: "pellentesque sollicitudin. Nunc"
+ text run at (15,1113) width 223: "gravida pharetra lectus. Etiam lacus"
+ text run at (15,1133) width 197: "ligula, placerat ut, dictum vitae,"
+ text run at (15,1153) width 200: "tempus vel, risus. Cras rhoncus."
+ text run at (15,1173) width 226: "Praesent varius ultricies orci. Donec"
+ text run at (15,1193) width 230: "mattis, neque ut ornare fringilla, ante"
+ text run at (15,1221) width 231: "urna placerat eros, vel commodo nisi"
+ text run at (15,1241) width 217: "tortor ut mauris. Morbi magna dui,"
+ text run at (15,1261) width 177: "sagittis sit amet, tincidunt et,"
+ text run at (15,1281) width 187: "elementum eget, quam. Fusce"
+ text run at (15,1301) width 230: "molestie nisl vitae nisi. Vestibulum a"
+ text run at (15,1321) width 234: "sapien. Phasellus ante lacus, vehicula"
+ text run at (15,1341) width 205: "non, cursus a, tempor ut, magna."
+ text run at (15,1361) width 219: "Suspendisse potenti. Fusce aliquet,"
+ text run at (15,1381) width 224: "odio viverra vulputate dictum, enim"
+ text run at (15,1401) width 201: "odio luctus purus, ut scelerisque"
+ text run at (15,1421) width 199: "quam nulla non est. Donec eros"
+ text run at (15,1441) width 202: "lacus, egestas vitae, lacinia quis,"
+ text run at (15,1461) width 218: "tempor quis, pede. Morbi orci erat,"
+ text run at (15,1481) width 218: "iaculis id, ornare ac, elementum at,"
+ text run at (15,1501) width 192: "sem. Nunc ornare sodales nisi."
+ text run at (15,1521) width 196: "Morbi interdum commodo nisl."
+ text run at (15,1541) width 195: "Fusce eget eros non nisi ornare"
+ text run at (15,1561) width 185: "facilisis. Sed placerat, est non"
+ text run at (15,1581) width 174: "posuere posuere, purus sem"
+ text run at (15,1601) width 200: "dignissim libero, a viverra tellus"
+ text run at (15,1621) width 220: "dolor vel lorem. Cras augue. Etiam"
+ text run at (15,1641) width 218: "ultricies consequat odio. Mauris ac"
+ text run at (15,1661) width 212: "libero. Etiam posuere, libero vitae"
+ text run at (15,1681) width 226: "euismod gravida, urna elit imperdiet"
+ text run at (15,1701) width 194: "magna, vel cursus elit felis non"
+ text run at (15,1721) width 207: "mauris. Donec orci erat, porta id,"
+ text run at (15,1741) width 211: "dignissim ut, posuere dictum, leo."
+ text run at (15,1761) width 199: "Suspendisse scelerisque egestas"
+ text run at (15,1781) width 35: "nulla."
diff --git a/LayoutTests/platform/gtk/fast/multicol/column-rules-stacking-expected.txt b/LayoutTests/platform/gtk/fast/multicol/column-rules-stacking-expected.txt
new file mode 100644
index 0000000..63ef91a
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/column-rules-stacking-expected.txt
@@ -0,0 +1,110 @@
+layer at (0,0) size 781x707
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x707
+ RenderBlock {HTML} at (0,0) size 781x707
+ RenderBody {BODY} at (8,8) size 765x691
+ RenderBlock (anonymous) at (0,0) size 765x40
+ RenderText {#text} at (0,0) size 745x40
+ text run at (0,0) width 717: "In the test below, the column rules should not be visible, since a negative z-index child is painting on top of them. "
+ text run at (717,0) width 28: "You"
+ text run at (0,20) width 157: "should see no red below."
+layer at (8,48) size 765x651 layerType: background only
+layer at (13,53) size 755x641
+ RenderBlock (positioned) zI: -1 {DIV} at (5,5) size 755x641 [bgcolor=#EEEEEE]
+layer at (8,48) size 765x651 layerType: foreground only
+ RenderBlock (relative positioned) {DIV} at (0,40) size 765x651 [bgcolor=#FF0000] [border: (5px solid #000000)]
+ RenderText {#text} at (35,5) size 221x1882
+ text run at (35,5) width 177: "Lorem ipsum dolor sit amet,"
+ text run at (35,25) width 212: "consectetuer adipiscing elit. Nulla"
+ text run at (35,45) width 179: "varius enim ac mi. Curabitur"
+ text run at (35,65) width 173: "sollicitudin felis quis lectus."
+ text run at (35,85) width 208: "Quisque adipiscing rhoncus sem."
+ text run at (35,105) width 201: "Proin nulla purus, vulputate vel,"
+ text run at (35,125) width 192: "varius ut, euismod et, nisi. Sed"
+ text run at (35,145) width 216: "vitae felis vel orci sagittis aliquam."
+ text run at (35,165) width 190: "Cras convallis adipiscing sem."
+ text run at (35,185) width 189: "Nam nonummy enim. Nullam"
+ text run at (35,205) width 160: "bibendum lobortis neque."
+ text run at (35,225) width 185: "Vestibulum velit orci, tempus"
+ text run at (35,245) width 203: "euismod, pretium quis, interdum"
+ text run at (35,265) width 211: "vitae, nulla. Phasellus eget ante et"
+ text run at (35,285) width 201: "tortor condimentum vestibulum."
+ text run at (35,305) width 202: "Suspendisse hendrerit quam nec"
+ text run at (35,325) width 211: "felis. Sed varius turpis vitae pede."
+ text run at (35,345) width 177: "Lorem ipsum dolor sit amet,"
+ text run at (35,365) width 211: "consectetuer adipiscing elit. Proin"
+ text run at (35,385) width 192: "bibendum justo ac enim. Class"
+ text run at (35,405) width 186: "aptent taciti sociosqu ad litora"
+ text run at (35,425) width 200: "torquent per conubia nostra, per"
+ text run at (35,445) width 221: "inceptos hymenaeos. Sed leo nulla,"
+ text run at (35,465) width 212: "rutrum eu, dictum ut, posuere vel,"
+ text run at (35,485) width 185: "arcu. Nam libero. Morbi orci."
+ text run at (35,505) width 213: "Maecenas pellentesque. Curabitur"
+ text run at (35,525) width 203: "erat erat, ullamcorper at, gravida"
+ text run at (35,545) width 194: "vitae, iaculis vitae, elit. Nullam"
+ text run at (35,565) width 168: "quam. Quisque orci lectus,"
+ text run at (35,585) width 190: "ullamcorper eu, imperdiet sed,"
+ text run at (35,605) width 193: "accumsan et, ligula. Duis diam"
+ text run at (35,625) width 194: "nisl, sagittis a, blandit volutpat,"
+ text run at (35,646) width 197: "interdum sed, velit. Vestibulum"
+ text run at (35,666) width 195: "quam. Nulla a purus. Phasellus"
+ text run at (35,686) width 177: "semper semper lectus. Nulla"
+ text run at (35,706) width 211: "porttitor, dolor dictum scelerisque"
+ text run at (35,726) width 215: "luctus, velit ipsum lobortis mauris,"
+ text run at (35,746) width 196: "ac pretium enim nunc vel risus."
+ text run at (35,766) width 194: "Proin gravida mi ut sem cursus"
+ text run at (35,786) width 188: "mattis. Fusce laoreet, nisi quis"
+ text run at (35,806) width 220: "luctus volutpat, arcu pede tincidunt"
+ text run at (35,826) width 208: "enim, nec malesuada urna nisl eu"
+ text run at (35,846) width 198: "enim. Vivamus varius augue ac"
+ text run at (35,866) width 193: "purus. Vestibulum vestibulum."
+ text run at (35,886) width 159: "Phasellus et est vitae ante"
+ text run at (35,906) width 163: "accumsan rhoncus. Morbi"
+ text run at (35,926) width 221: "convallis, arcu at hendrerit gravida,"
+ text run at (35,946) width 186: "sem diam dignissim risus, sed"
+ text run at (35,966) width 212: "aliquet erat mi ut mi. Nunc cursus"
+ text run at (35,986) width 209: "lacinia elit. Nunc nisi. Quisque at"
+ text run at (35,1006) width 190: "erat. Vestibulum dictum quam"
+ text run at (35,1026) width 197: "vitae nibh. Nunc vitae ante non"
+ text run at (35,1046) width 203: "odio interdum blandit. Curabitur"
+ text run at (35,1066) width 210: "leo quam, fermentum sed, feugiat"
+ text run at (35,1086) width 151: "in, ullamcorper id, nibh."
+ text run at (35,1106) width 199: "Suspendisse ac turpis. In iaculis"
+ text run at (35,1126) width 184: "sollicitudin dui. Aenean vitae"
+ text run at (35,1146) width 187: "lectus vitae nulla pellentesque"
+ text run at (35,1166) width 218: "sollicitudin. Nunc gravida pharetra"
+ text run at (35,1186) width 213: "lectus. Etiam lacus ligula, placerat"
+ text run at (35,1206) width 214: "ut, dictum vitae, tempus vel, risus."
+ text run at (35,1226) width 186: "Cras rhoncus. Praesent varius"
+ text run at (35,1246) width 214: "ultricies orci. Donec mattis, neque"
+ text run at (35,1266) width 175: "ut ornare fringilla, ante urna"
+ text run at (35,1287) width 199: "placerat eros, vel commodo nisi"
+ text run at (35,1307) width 217: "tortor ut mauris. Morbi magna dui,"
+ text run at (35,1327) width 177: "sagittis sit amet, tincidunt et,"
+ text run at (35,1347) width 187: "elementum eget, quam. Fusce"
+ text run at (35,1367) width 219: "molestie nisl vitae nisi. Vestibulum"
+ text run at (35,1387) width 188: "a sapien. Phasellus ante lacus,"
+ text run at (35,1407) width 212: "vehicula non, cursus a, tempor ut,"
+ text run at (35,1427) width 219: "magna. Suspendisse potenti. Fusce"
+ text run at (35,1447) width 188: "aliquet, odio viverra vulputate"
+ text run at (35,1467) width 214: "dictum, enim odio luctus purus, ut"
+ text run at (35,1487) width 196: "scelerisque quam nulla non est."
+ text run at (35,1507) width 199: "Donec eros lacus, egestas vitae,"
+ text run at (35,1527) width 195: "lacinia quis, tempor quis, pede."
+ text run at (35,1547) width 206: "Morbi orci erat, iaculis id, ornare"
+ text run at (35,1567) width 182: "ac, elementum at, sem. Nunc"
+ text run at (35,1587) width 163: "ornare sodales nisi. Morbi"
+ text run at (35,1607) width 194: "interdum commodo nisl. Fusce"
+ text run at (35,1627) width 209: "eget eros non nisi ornare facilisis."
+ text run at (35,1647) width 183: "Sed placerat, est non posuere"
+ text run at (35,1667) width 185: "posuere, purus sem dignissim"
+ text run at (35,1687) width 196: "libero, a viverra tellus dolor vel"
+ text run at (35,1707) width 213: "lorem. Cras augue. Etiam ultricies"
+ text run at (35,1727) width 209: "consequat odio. Mauris ac libero."
+ text run at (35,1747) width 168: "Etiam posuere, libero vitae"
+ text run at (35,1767) width 163: "euismod gravida, urna elit"
+ text run at (35,1787) width 199: "imperdiet magna, vel cursus elit"
+ text run at (35,1807) width 209: "felis non mauris. Donec orci erat,"
+ text run at (35,1827) width 189: "porta id, dignissim ut, posuere"
+ text run at (35,1847) width 155: "dictum, leo. Suspendisse"
+ text run at (35,1867) width 157: "scelerisque egestas nulla."
diff --git a/LayoutTests/platform/gtk/fast/multicol/columns-shorthand-parsing-expected.txt b/LayoutTests/platform/gtk/fast/multicol/columns-shorthand-parsing-expected.txt
new file mode 100644
index 0000000..715d9de
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/columns-shorthand-parsing-expected.txt
@@ -0,0 +1,83 @@
+layer at (0,0) size 781x776
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x776
+ RenderBlock {HTML} at (0,0) size 781x776
+ RenderBody {BODY} at (8,8) size 765x760
+layer at (8,8) size 765x760
+ RenderBlock {DIV} at (0,0) size 765x760
+ RenderText {#text} at (0,0) size 372x1500
+ text run at (0,0) width 372: "This content should be split into two columns. This content"
+ text run at (0,20) width 355: "should be split into two columns. This content should be"
+ text run at (0,40) width 348: "split into two columns. This content should be split into"
+ text run at (0,60) width 318: "two columns. This content should be split into two"
+ text run at (0,80) width 351: "columns. This content should be split into two columns."
+ text run at (0,100) width 372: "This content should be split into two columns. This content"
+ text run at (0,120) width 355: "should be split into two columns. This content should be"
+ text run at (0,140) width 348: "split into two columns. This content should be split into"
+ text run at (0,160) width 318: "two columns. This content should be split into two"
+ text run at (0,180) width 351: "columns. This content should be split into two columns."
+ text run at (0,200) width 372: "This content should be split into two columns. This content"
+ text run at (0,220) width 355: "should be split into two columns. This content should be"
+ text run at (0,240) width 348: "split into two columns. This content should be split into"
+ text run at (0,260) width 318: "two columns. This content should be split into two"
+ text run at (0,280) width 351: "columns. This content should be split into two columns."
+ text run at (0,300) width 372: "This content should be split into two columns. This content"
+ text run at (0,320) width 355: "should be split into two columns. This content should be"
+ text run at (0,340) width 348: "split into two columns. This content should be split into"
+ text run at (0,360) width 318: "two columns. This content should be split into two"
+ text run at (0,380) width 351: "columns. This content should be split into two columns."
+ text run at (0,400) width 372: "This content should be split into two columns. This content"
+ text run at (0,420) width 355: "should be split into two columns. This content should be"
+ text run at (0,440) width 348: "split into two columns. This content should be split into"
+ text run at (0,460) width 318: "two columns. This content should be split into two"
+ text run at (0,480) width 351: "columns. This content should be split into two columns."
+ text run at (0,500) width 372: "This content should be split into two columns. This content"
+ text run at (0,520) width 355: "should be split into two columns. This content should be"
+ text run at (0,540) width 348: "split into two columns. This content should be split into"
+ text run at (0,560) width 318: "two columns. This content should be split into two"
+ text run at (0,580) width 351: "columns. This content should be split into two columns."
+ text run at (0,600) width 372: "This content should be split into two columns. This content"
+ text run at (0,620) width 355: "should be split into two columns. This content should be"
+ text run at (0,640) width 348: "split into two columns. This content should be split into"
+ text run at (0,660) width 318: "two columns. This content should be split into two"
+ text run at (0,680) width 351: "columns. This content should be split into two columns."
+ text run at (0,700) width 372: "This content should be split into two columns. This content"
+ text run at (0,720) width 355: "should be split into two columns. This content should be"
+ text run at (0,740) width 348: "split into two columns. This content should be split into"
+ text run at (0,760) width 318: "two columns. This content should be split into two"
+ text run at (0,780) width 351: "columns. This content should be split into two columns."
+ text run at (0,800) width 372: "This content should be split into two columns. This content"
+ text run at (0,820) width 355: "should be split into two columns. This content should be"
+ text run at (0,840) width 348: "split into two columns. This content should be split into"
+ text run at (0,860) width 318: "two columns. This content should be split into two"
+ text run at (0,880) width 351: "columns. This content should be split into two columns."
+ text run at (0,900) width 372: "This content should be split into two columns. This content"
+ text run at (0,920) width 355: "should be split into two columns. This content should be"
+ text run at (0,940) width 348: "split into two columns. This content should be split into"
+ text run at (0,960) width 318: "two columns. This content should be split into two"
+ text run at (0,980) width 351: "columns. This content should be split into two columns."
+ text run at (0,1000) width 372: "This content should be split into two columns. This content"
+ text run at (0,1020) width 355: "should be split into two columns. This content should be"
+ text run at (0,1040) width 348: "split into two columns. This content should be split into"
+ text run at (0,1060) width 318: "two columns. This content should be split into two"
+ text run at (0,1080) width 351: "columns. This content should be split into two columns."
+ text run at (0,1100) width 372: "This content should be split into two columns. This content"
+ text run at (0,1120) width 355: "should be split into two columns. This content should be"
+ text run at (0,1140) width 348: "split into two columns. This content should be split into"
+ text run at (0,1160) width 318: "two columns. This content should be split into two"
+ text run at (0,1180) width 351: "columns. This content should be split into two columns."
+ text run at (0,1200) width 372: "This content should be split into two columns. This content"
+ text run at (0,1220) width 355: "should be split into two columns. This content should be"
+ text run at (0,1240) width 348: "split into two columns. This content should be split into"
+ text run at (0,1260) width 318: "two columns. This content should be split into two"
+ text run at (0,1280) width 351: "columns. This content should be split into two columns."
+ text run at (0,1300) width 372: "This content should be split into two columns. This content"
+ text run at (0,1320) width 355: "should be split into two columns. This content should be"
+ text run at (0,1340) width 348: "split into two columns. This content should be split into"
+ text run at (0,1360) width 318: "two columns. This content should be split into two"
+ text run at (0,1380) width 351: "columns. This content should be split into two columns."
+ text run at (0,1400) width 372: "This content should be split into two columns. This content"
+ text run at (0,1420) width 355: "should be split into two columns. This content should be"
+ text run at (0,1440) width 348: "split into two columns. This content should be split into"
+ text run at (0,1460) width 318: "two columns. This content should be split into two"
+ text run at (0,1480) width 351: "columns. This content should be split into two columns."
diff --git a/LayoutTests/platform/gtk/fast/multicol/float-avoidance-expected.txt b/LayoutTests/platform/gtk/fast/multicol/float-avoidance-expected.txt
new file mode 100644
index 0000000..902ad5a
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/float-avoidance-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock (floating) {DIV} at (0,0) size 200x100 [bgcolor=#00FF00]
+layer at (208,8) size 435x136
+ RenderBlock {DIV} at (200,0) size 435x136 [border: (10px solid #000000)]
+ RenderBlock {P} at (10,10) size 415x100
+ RenderText {#text} at (0,0) size 415x100
+ text run at (0,0) width 415: "This technology preview of our award winning next generation"
+ text run at (0,20) width 56: "browser "
+ text run at (56,20) width 359: "is a sign of things to come from Mozilla. Powerful yet"
+ text run at (0,40) width 122: "easy to use. This "
+ text run at (122,40) width 293: "maintenance release provides a few updates"
+ text run at (0,60) width 246: "based on user feedback - including "
+ text run at (246,60) width 169: "changes to the Extension"
+ text run at (0,80) width 201: "System and icon improvements."
diff --git a/LayoutTests/platform/gtk/fast/multicol/float-multicol-expected.txt b/LayoutTests/platform/gtk/fast/multicol/float-multicol-expected.txt
new file mode 100644
index 0000000..e849d59
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/float-multicol-expected.txt
@@ -0,0 +1,233 @@
+layer at (0,0) size 1570x620
+ RenderView at (0,0) size 781x581
+layer at (0,0) size 1570x620
+ RenderBlock {HTML} at (0,0) size 781x620
+layer at (8,19) size 1562x585
+ RenderBody {BODY} at (8,19) size 765x585
+ RenderBlock {DIV} at (0,0) size 765x33 [bgcolor=#00FFFF]
+ RenderBlock (floating) {DIV} at (4,4) size 382x492 [bgcolor=#FFFF00]
+ RenderImage {IMG} at (0,0) size 133x70
+ RenderText {#text} at (133,0) size 379x100
+ text run at (133,0) width 229: "You've already downloaded a build."
+ text run at (133,20) width 219: "All you have to do is use it as your"
+ text run at (133,40) width 208: "everyday browser and mail/news"
+ text run at (133,60) width 246: "reader. If you downloaded a build with"
+ text run at (0,80) width 253: "Talkback, please turn it on when it asks."
+ RenderBlock (floating) {DIV} at (300,80) size 82x412 [bgcolor=#FF0000]
+ RenderBlock {P} at (0,16) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 1"
+ RenderBlock {P} at (0,52) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 2"
+ RenderBlock {P} at (0,88) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 3"
+ RenderBlock {P} at (0,124) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 4"
+ RenderBlock {P} at (0,160) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 5"
+ RenderBlock {P} at (0,196) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 6"
+ RenderBlock {P} at (0,232) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 7"
+ RenderBlock {P} at (0,268) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 8"
+ RenderBlock {P} at (0,304) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 9"
+ RenderBlock {P} at (0,340) size 82x20
+ RenderText {#text} at (0,0) size 82x20
+ text run at (0,0) width 82: "Hola hola 10"
+ RenderBlock {P} at (0,376) size 82x20
+ RenderText {#text} at (0,0) size 82x20
+ text run at (0,0) width 82: "Hola hola 11"
+ RenderText {#text} at (0,100) size 300x60
+ text run at (0,100) width 281: "Talkback reports give us really valuable data"
+ text run at (0,120) width 300: "on which crashes are the most serious, and how"
+ text run at (0,140) width 226: "often people are encountering them."
+ RenderBlock (floating) {DIV} at (682,0) size 83x324 [bgcolor=#FF00FF]
+ RenderBlock {P} at (0,0) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 1"
+ RenderBlock {P} at (0,36) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 2"
+ RenderBlock {P} at (0,72) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 3"
+ RenderBlock {P} at (0,108) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 4"
+ RenderBlock {P} at (0,144) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 5"
+ RenderBlock {P} at (0,180) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 6"
+ RenderBlock {P} at (0,216) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 7"
+ RenderBlock {P} at (0,252) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 8"
+ RenderBlock {P} at (0,288) size 83x20
+ RenderText {#text} at (0,0) size 83x20
+ text run at (0,0) width 83: "Hello Kitty 9"
+ RenderBlock {H2} at (0,0) size 765x33
+ RenderText {#text} at (390,0) size 262x33
+ text run at (390,0) width 262: "What Needs To Be Done?"
+ RenderBlock (floating) {DIV} at (390,52) size 82x412 [bgcolor=#808080]
+ RenderBlock {P} at (0,16) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 1"
+ RenderBlock {P} at (0,52) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 2"
+ RenderBlock {P} at (0,88) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 3"
+ RenderBlock {P} at (0,124) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 4"
+ RenderBlock {P} at (0,160) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 5"
+ RenderBlock {P} at (0,196) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 6"
+ RenderBlock {P} at (0,232) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 7"
+ RenderBlock {P} at (0,268) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 8"
+ RenderBlock {P} at (0,304) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 9"
+ RenderBlock {P} at (0,340) size 82x20
+ RenderText {#text} at (0,0) size 82x20
+ text run at (0,0) width 82: "Hola hola 10"
+ RenderBlock {P} at (0,376) size 82x20
+ RenderText {#text} at (0,0) size 82x20
+ text run at (0,0) width 82: "Hola hola 11"
+ RenderBlock {DL} at (0,52) size 765x633
+ RenderBlock {DT} at (0,0) size 765x20
+ RenderText {#text} at (472,0) size 80x20
+ text run at (472,0) width 80: "Report Bugs"
+ RenderBlock {DD} at (40,36) size 725x300
+ RenderBlock {P} at (0,0) size 725x300
+ RenderText {#text} at (432,0) size 209x120
+ text run at (432,0) width 189: "You've already downloaded a"
+ text run at (432,20) width 209: "build. All you have to do is use it"
+ text run at (432,40) width 17: "as "
+ text run at (449,40) width 173: "your everyday browser and"
+ text run at (432,60) width 153: "mail/news reader. If you"
+ text run at (432,80) width 157: "downloaded a build with"
+ text run at (432,100) width 67: "Talkback, "
+ RenderInline {EM} at (0,0) size 102x20
+ RenderText {#text} at (499,100) size 102x20
+ text run at (499,100) width 44: "please "
+ text run at (543,100) width 58: "turn it on"
+ RenderText {#text} at (601,100) size 272x180
+ text run at (601,100) width 39: " when"
+ text run at (432,120) width 188: "it asks. Talkback reports give "
+ text run at (620,120) width 14: "us"
+ text run at (432,140) width 126: "really valuable data "
+ text run at (558,140) width 59: "on which"
+ text run at (432,160) width 205: "crashes are the most serious, and"
+ text run at (432,180) width 32: "how "
+ text run at (464,180) width 101: "often people are"
+ text run at (432,200) width 86: "encountering "
+ text run at (518,200) width 114: "them. And all you"
+ text run at (432,220) width 164: "have to do is click \"OK\". "
+ text run at (596,220) width 38: "If you"
+ text run at (432,240) width 272: "find something you think is a bug, check to"
+ text run at (432,260) width 132: "see if it's not already "
+ RenderInline {A} at (0,0) size 83x20 [color=#0000EE]
+ RenderText {#text} at (564,260) size 83x20
+ text run at (564,260) width 83: "known about"
+ RenderText {#text} at (647,260) size 277x40
+ text run at (647,260) width 62: ", and then"
+ text run at (432,280) width 43: "please "
+ text run at (475,280) width 68: "follow the "
+ RenderInline {A} at (0,0) size 165x20 [color=#0000EE]
+ RenderText {#text} at (543,280) size 165x20
+ text run at (543,280) width 165: "bug submission procedure"
+ RenderText {#text} at (708,280) size 4x20
+ text run at (708,280) width 4: "."
+ RenderBlock (floating) {DIV} at (472,352) size 82x397 [bgcolor=#008000]
+ RenderBlock {P} at (0,16) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 1"
+ RenderBlock {P} at (0,52) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 2"
+ RenderBlock {P} at (0,88) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 3"
+ RenderBlock {P} at (0,124) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 4"
+ RenderBlock {P} at (0,160) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 5"
+ RenderBlock {P} at (0,181) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 6"
+ RenderBlock {P} at (0,217) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 7"
+ RenderBlock {P} at (0,253) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 8"
+ RenderBlock {P} at (0,289) size 82x20
+ RenderText {#text} at (0,0) size 74x20
+ text run at (0,0) width 74: "Hola hola 9"
+ RenderBlock {P} at (0,325) size 82x20
+ RenderText {#text} at (0,0) size 82x20
+ text run at (0,0) width 82: "Hola hola 10"
+ RenderBlock {P} at (0,361) size 82x20
+ RenderText {#text} at (0,0) size 82x20
+ text run at (0,0) width 82: "Hola hola 11"
+ RenderBlock {DT} at (0,352) size 765x20
+ RenderText {#text} at (554,0) size 117x20
+ text run at (554,0) width 117: "Quality Assurance"
+ RenderBlock {DD} at (40,388) size 725x245
+ RenderBlock {P} at (0,0) size 725x245
+ RenderInline {A} at (0,0) size 76x20 [color=#0000EE]
+ RenderText {#text} at (514,0) size 76x20
+ text run at (514,0) width 76: "Mozilla QA"
+ RenderText {#text} at (590,0) size 40x20
+ text run at (590,0) width 4: " "
+ text run at (594,0) width 36: "has a "
+ RenderInline {A} at (0,0) size 30x20 [color=#0000EE]
+ RenderText {#text} at (630,0) size 30x20
+ text run at (630,0) width 30: "page"
+ RenderText {#text} at (660,0) size 210x225
+ text run at (660,0) width 4: " "
+ text run at (664,0) width 60: "dedicated"
+ text run at (514,20) width 179: "to ways to get involved with"
+ text run at (514,40) width 182: "helping. This doesn't involve"
+ text run at (514,60) width 201: "knowing how to code, although"
+ text run at (514,80) width 193: "a little knowledge of HTML is"
+ text run at (514,100) width 94: "helpful. Being "
+ text run at (608,100) width 115: "involved with QA"
+ text run at (514,120) width 14: "is "
+ text run at (528,120) width 194: "good for people wanting to get"
+ text run at (514,145) width 120: "more familiar with "
+ text run at (634,145) width 79: "Mozilla, and"
+ text run at (514,165) width 189: "there's a strong community. A"
+ text run at (514,185) width 177: "particularly good way to get"
+ text run at (514,205) width 59: "involved "
+ text run at (573,205) width 77: "is to join the"
+ RenderInline {A} at (0,0) size 73x20 [color=#0000EE]
+ RenderText {#text} at (514,225) size 73x20
+ text run at (514,225) width 73: "BugAThon"
+ RenderText {#text} at (587,225) size 4x20
+ text run at (587,225) width 4: "."
diff --git a/LayoutTests/platform/gtk/fast/multicol/float-paginate-complex-expected.txt b/LayoutTests/platform/gtk/fast/multicol/float-paginate-complex-expected.txt
new file mode 100644
index 0000000..28e18da
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/float-paginate-complex-expected.txt
@@ -0,0 +1,304 @@
+layer at (0,0) size 1158x1680
+ RenderView at (0,0) size 781x581
+layer at (0,0) size 1158x1680
+ RenderBlock {HTML} at (0,0) size 781x1680
+ RenderBody {BODY} at (8,8) size 765x1664
+layer at (8,8) size 1150x404
+ RenderBlock {DIV} at (0,0) size 765x404 [border: (2px solid #000000)]
+ RenderBlock (anonymous) at (2,2) size 372x280
+ RenderText {#text} at (0,0) size 110x20
+ text run at (0,0) width 110: "This is some text."
+ RenderBR {BR} at (110,15) size 0x0
+ RenderText {#text} at (0,20) size 110x20
+ text run at (0,20) width 110: "This is some text."
+ RenderBR {BR} at (110,35) size 0x0
+ RenderText {#text} at (0,40) size 110x20
+ text run at (0,40) width 110: "This is some text."
+ RenderBR {BR} at (110,55) size 0x0
+ RenderText {#text} at (0,60) size 110x20
+ text run at (0,60) width 110: "This is some text."
+ RenderBR {BR} at (110,75) size 0x0
+ RenderText {#text} at (0,80) size 110x20
+ text run at (0,80) width 110: "This is some text."
+ RenderBR {BR} at (110,95) size 0x0
+ RenderText {#text} at (0,100) size 110x20
+ text run at (0,100) width 110: "This is some text."
+ RenderBR {BR} at (110,115) size 0x0
+ RenderText {#text} at (0,120) size 110x20
+ text run at (0,120) width 110: "This is some text."
+ RenderBR {BR} at (110,135) size 0x0
+ RenderText {#text} at (0,140) size 110x20
+ text run at (0,140) width 110: "This is some text."
+ RenderBR {BR} at (110,155) size 0x0
+ RenderText {#text} at (0,160) size 110x20
+ text run at (0,160) width 110: "This is some text."
+ RenderBR {BR} at (110,175) size 0x0
+ RenderText {#text} at (0,180) size 110x20
+ text run at (0,180) width 110: "This is some text."
+ RenderBR {BR} at (110,195) size 0x0
+ RenderText {#text} at (0,200) size 110x20
+ text run at (0,200) width 110: "This is some text."
+ RenderBR {BR} at (110,215) size 0x0
+ RenderText {#text} at (0,220) size 110x20
+ text run at (0,220) width 110: "This is some text."
+ RenderBR {BR} at (110,235) size 0x0
+ RenderText {#text} at (0,240) size 110x20
+ text run at (0,240) width 110: "This is some text."
+ RenderBR {BR} at (110,255) size 0x0
+ RenderText {#text} at (0,260) size 110x20
+ text run at (0,260) width 110: "This is some text."
+ RenderBR {BR} at (110,275) size 0x0
+ RenderBlock {P} at (2,298) size 372x624
+ RenderBlock (floating) {SPAN} at (0,104) size 78x155
+ RenderText {#text} at (0,0) size 78x155
+ text run at (0,0) width 78: "T"
+ RenderText {#text} at (78,104) size 100x20
+ text run at (78,104) width 100: "his is some text."
+ RenderBR {BR} at (178,119) size 0x0
+ RenderText {#text} at (78,124) size 110x20
+ text run at (78,124) width 110: "This is some text."
+ RenderBR {BR} at (188,139) size 0x0
+ RenderText {#text} at (78,144) size 110x20
+ text run at (78,144) width 110: "This is some text."
+ RenderBR {BR} at (188,159) size 0x0
+ RenderText {#text} at (78,164) size 110x20
+ text run at (78,164) width 110: "This is some text."
+ RenderBR {BR} at (188,179) size 0x0
+ RenderText {#text} at (78,184) size 110x20
+ text run at (78,184) width 110: "This is some text."
+ RenderBR {BR} at (188,199) size 0x0
+ RenderText {#text} at (78,204) size 110x20
+ text run at (78,204) width 110: "This is some text."
+ RenderBR {BR} at (188,219) size 0x0
+ RenderText {#text} at (78,224) size 110x20
+ text run at (78,224) width 110: "This is some text."
+ RenderBR {BR} at (188,239) size 0x0
+ RenderText {#text} at (78,244) size 110x20
+ text run at (78,244) width 110: "This is some text."
+ RenderBR {BR} at (188,259) size 0x0
+ RenderText {#text} at (0,264) size 110x20
+ text run at (0,264) width 110: "This is some text."
+ RenderBR {BR} at (110,279) size 0x0
+ RenderText {#text} at (0,284) size 110x20
+ text run at (0,284) width 110: "This is some text."
+ RenderBR {BR} at (110,299) size 0x0
+ RenderText {#text} at (0,304) size 110x20
+ text run at (0,304) width 110: "This is some text."
+ RenderBR {BR} at (110,319) size 0x0
+ RenderText {#text} at (0,324) size 110x20
+ text run at (0,324) width 110: "This is some text."
+ RenderBR {BR} at (110,339) size 0x0
+ RenderText {#text} at (0,344) size 110x20
+ text run at (0,344) width 110: "This is some text."
+ RenderBR {BR} at (110,359) size 0x0
+ RenderText {#text} at (0,364) size 110x20
+ text run at (0,364) width 110: "This is some text."
+ RenderBR {BR} at (110,379) size 0x0
+ RenderText {#text} at (0,384) size 110x20
+ text run at (0,384) width 110: "This is some text."
+ RenderBR {BR} at (110,399) size 0x0
+ RenderText {#text} at (0,404) size 110x20
+ text run at (0,404) width 110: "This is some text."
+ RenderBR {BR} at (110,419) size 0x0
+ RenderText {#text} at (0,424) size 110x20
+ text run at (0,424) width 110: "This is some text."
+ RenderBR {BR} at (110,439) size 0x0
+ RenderText {#text} at (0,444) size 110x20
+ text run at (0,444) width 110: "This is some text."
+ RenderBR {BR} at (110,459) size 0x0
+ RenderText {#text} at (0,464) size 110x20
+ text run at (0,464) width 110: "This is some text."
+ RenderBR {BR} at (110,479) size 0x0
+ RenderText {#text} at (0,484) size 110x20
+ text run at (0,484) width 110: "This is some text."
+ RenderBR {BR} at (110,499) size 0x0
+ RenderText {#text} at (0,504) size 110x20
+ text run at (0,504) width 110: "This is some text."
+ RenderBR {BR} at (110,519) size 0x0
+ RenderText {#text} at (0,524) size 110x20
+ text run at (0,524) width 110: "This is some text."
+ RenderBR {BR} at (110,539) size 0x0
+ RenderText {#text} at (0,544) size 110x20
+ text run at (0,544) width 110: "This is some text."
+ RenderBR {BR} at (110,559) size 0x0
+ RenderText {#text} at (0,564) size 110x20
+ text run at (0,564) width 110: "This is some text."
+ RenderBR {BR} at (110,579) size 0x0
+ RenderText {#text} at (0,584) size 110x20
+ text run at (0,584) width 110: "This is some text."
+ RenderBR {BR} at (110,599) size 0x0
+ RenderText {#text} at (0,604) size 110x20
+ text run at (0,604) width 110: "This is some text."
+ RenderBR {BR} at (110,619) size 0x0
+layer at (8,428) size 1150x404
+ RenderBlock {DIV} at (0,420) size 765x404 [border: (2px solid #000000)]
+ RenderBlock (anonymous) at (2,2) size 372x280
+ RenderText {#text} at (0,0) size 110x20
+ text run at (0,0) width 110: "This is some text."
+ RenderBR {BR} at (110,15) size 0x0
+ RenderText {#text} at (0,20) size 110x20
+ text run at (0,20) width 110: "This is some text."
+ RenderBR {BR} at (110,35) size 0x0
+ RenderText {#text} at (0,40) size 110x20
+ text run at (0,40) width 110: "This is some text."
+ RenderBR {BR} at (110,55) size 0x0
+ RenderText {#text} at (0,60) size 110x20
+ text run at (0,60) width 110: "This is some text."
+ RenderBR {BR} at (110,75) size 0x0
+ RenderText {#text} at (0,80) size 110x20
+ text run at (0,80) width 110: "This is some text."
+ RenderBR {BR} at (110,95) size 0x0
+ RenderText {#text} at (0,100) size 110x20
+ text run at (0,100) width 110: "This is some text."
+ RenderBR {BR} at (110,115) size 0x0
+ RenderText {#text} at (0,120) size 110x20
+ text run at (0,120) width 110: "This is some text."
+ RenderBR {BR} at (110,135) size 0x0
+ RenderText {#text} at (0,140) size 110x20
+ text run at (0,140) width 110: "This is some text."
+ RenderBR {BR} at (110,155) size 0x0
+ RenderText {#text} at (0,160) size 110x20
+ text run at (0,160) width 110: "This is some text."
+ RenderBR {BR} at (110,175) size 0x0
+ RenderText {#text} at (0,180) size 110x20
+ text run at (0,180) width 110: "This is some text."
+ RenderBR {BR} at (110,195) size 0x0
+ RenderText {#text} at (0,200) size 110x20
+ text run at (0,200) width 110: "This is some text."
+ RenderBR {BR} at (110,215) size 0x0
+ RenderText {#text} at (0,220) size 110x20
+ text run at (0,220) width 110: "This is some text."
+ RenderBR {BR} at (110,235) size 0x0
+ RenderText {#text} at (0,240) size 110x20
+ text run at (0,240) width 110: "This is some text."
+ RenderBR {BR} at (110,255) size 0x0
+ RenderText {#text} at (0,260) size 110x20
+ text run at (0,260) width 110: "This is some text."
+ RenderBR {BR} at (110,275) size 0x0
+ RenderBlock {P} at (2,298) size 372x624
+ RenderImage {IMG} at (0,104) size 100x100 [bgcolor=#008000]
+ RenderImage {IMG} at (272,104) size 100x200 [bgcolor=#008000]
+ RenderText {#text} at (100,104) size 106x20
+ text run at (100,104) width 106: "This is some text"
+ RenderBR {BR} at (206,119) size 0x0
+ RenderText {#text} at (100,124) size 110x20
+ text run at (100,124) width 110: "This is some text."
+ RenderBR {BR} at (210,139) size 0x0
+ RenderText {#text} at (100,144) size 110x20
+ text run at (100,144) width 110: "This is some text."
+ RenderBR {BR} at (210,159) size 0x0
+ RenderText {#text} at (100,164) size 110x20
+ text run at (100,164) width 110: "This is some text."
+ RenderBR {BR} at (210,179) size 0x0
+ RenderText {#text} at (100,184) size 110x20
+ text run at (100,184) width 110: "This is some text."
+ RenderBR {BR} at (210,199) size 0x0
+ RenderText {#text} at (0,204) size 110x20
+ text run at (0,204) width 110: "This is some text."
+ RenderBR {BR} at (110,219) size 0x0
+ RenderText {#text} at (0,224) size 110x20
+ text run at (0,224) width 110: "This is some text."
+ RenderBR {BR} at (110,239) size 0x0
+ RenderText {#text} at (0,244) size 110x20
+ text run at (0,244) width 110: "This is some text."
+ RenderBR {BR} at (110,259) size 0x0
+ RenderText {#text} at (0,264) size 110x20
+ text run at (0,264) width 110: "This is some text."
+ RenderBR {BR} at (110,279) size 0x0
+ RenderText {#text} at (0,284) size 110x20
+ text run at (0,284) width 110: "This is some text."
+ RenderBR {BR} at (110,299) size 0x0
+ RenderText {#text} at (0,304) size 110x20
+ text run at (0,304) width 110: "This is some text."
+ RenderBR {BR} at (110,319) size 0x0
+ RenderText {#text} at (0,324) size 110x20
+ text run at (0,324) width 110: "This is some text."
+ RenderBR {BR} at (110,339) size 0x0
+ RenderText {#text} at (0,344) size 110x20
+ text run at (0,344) width 110: "This is some text."
+ RenderBR {BR} at (110,359) size 0x0
+ RenderText {#text} at (0,364) size 110x20
+ text run at (0,364) width 110: "This is some text."
+ RenderBR {BR} at (110,379) size 0x0
+ RenderText {#text} at (0,384) size 110x20
+ text run at (0,384) width 110: "This is some text."
+ RenderBR {BR} at (110,399) size 0x0
+ RenderText {#text} at (0,404) size 110x20
+ text run at (0,404) width 110: "This is some text."
+ RenderBR {BR} at (110,419) size 0x0
+ RenderText {#text} at (0,424) size 110x20
+ text run at (0,424) width 110: "This is some text."
+ RenderBR {BR} at (110,439) size 0x0
+ RenderText {#text} at (0,444) size 110x20
+ text run at (0,444) width 110: "This is some text."
+ RenderBR {BR} at (110,459) size 0x0
+ RenderText {#text} at (0,464) size 110x20
+ text run at (0,464) width 110: "This is some text."
+ RenderBR {BR} at (110,479) size 0x0
+ RenderText {#text} at (0,484) size 110x20
+ text run at (0,484) width 110: "This is some text."
+ RenderBR {BR} at (110,499) size 0x0
+ RenderText {#text} at (0,504) size 110x20
+ text run at (0,504) width 110: "This is some text."
+ RenderBR {BR} at (110,519) size 0x0
+ RenderText {#text} at (0,524) size 110x20
+ text run at (0,524) width 110: "This is some text."
+ RenderBR {BR} at (110,539) size 0x0
+ RenderText {#text} at (0,544) size 110x20
+ text run at (0,544) width 110: "This is some text."
+ RenderBR {BR} at (110,559) size 0x0
+ RenderText {#text} at (0,564) size 110x20
+ text run at (0,564) width 110: "This is some text."
+ RenderBR {BR} at (110,579) size 0x0
+ RenderText {#text} at (0,584) size 110x20
+ text run at (0,584) width 110: "This is some text."
+ RenderBR {BR} at (110,599) size 0x0
+ RenderText {#text} at (0,604) size 110x20
+ text run at (0,604) width 110: "This is some text."
+ RenderBR {BR} at (110,619) size 0x0
+layer at (8,848) size 765x404
+ RenderBlock {DIV} at (0,840) size 765x404 [border: (2px solid #000000)]
+ RenderImage {IMG} at (2,2) size 300x390 [bgcolor=#008000]
+ RenderText {#text} at (302,2) size 372x460
+ text run at (302,2) width 46: "Longer"
+ text run at (302,22) width 23: "text"
+ text run at (302,42) width 72: "designed to"
+ text run at (302,62) width 53: "test float"
+ text run at (302,82) width 23: "and"
+ text run at (302,102) width 60: "wrapping"
+ text run at (302,122) width 59: "behavior."
+ text run at (302,142) width 46: "Longer"
+ text run at (302,162) width 23: "text"
+ text run at (302,182) width 72: "designed to"
+ text run at (302,202) width 53: "test float"
+ text run at (302,222) width 23: "and"
+ text run at (302,242) width 60: "wrapping"
+ text run at (302,262) width 59: "behavior."
+ text run at (302,282) width 46: "Longer"
+ text run at (302,302) width 23: "text"
+ text run at (302,322) width 72: "designed to"
+ text run at (302,342) width 53: "test float"
+ text run at (302,362) width 23: "and"
+ text run at (302,382) width 60: "wrapping"
+ text run at (2,402) width 360: "behavior. Longer text designed to test float and wrapping"
+ text run at (2,422) width 360: "behavior. Longer text designed to test float and wrapping"
+ text run at (2,442) width 59: "behavior."
+layer at (8,1268) size 765x404
+ RenderBlock {DIV} at (0,1260) size 765x404 [border: (2px solid #000000)]
+ RenderImage {IMG} at (2,2) size 372x380 [bgcolor=#0000FF]
+ RenderInline {SPAN} at (0,0) size 370x270
+ RenderImage {IMG} at (2,402) size 100x20 [bgcolor=#008000]
+ RenderText {#text} at (102,402) size 211x30
+ text run at (102,402) width 211: "Longer text designed "
+ RenderImage {IMG} at (274,432) size 100x20 [bgcolor=#008000]
+ RenderText {#text} at (313,402) size 370x270
+ text run at (313,402) width 59: "to test"
+ text run at (2,432) width 183: "float and wrapping"
+ text run at (2,462) width 367: "behavior. Longer text designed to test"
+ text run at (2,492) width 356: "float and wrapping behavior. Longer"
+ text run at (2,522) width 286: "text designed to test float and"
+ text run at (2,552) width 307: "wrapping behavior. Longer text"
+ text run at (2,582) width 340: "designed to test float and wrapping"
+ text run at (2,612) width 367: "behavior. Longer text designed to test"
+ text run at (2,642) width 280: "float and wrapping behavior."
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/float-paginate-expected.txt b/LayoutTests/platform/gtk/fast/multicol/float-paginate-expected.txt
new file mode 100644
index 0000000..b7e5103
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/float-paginate-expected.txt
@@ -0,0 +1,128 @@
+layer at (0,0) size 1188x581
+ RenderView at (0,0) size 800x581
+layer at (0,0) size 1188x581
+ RenderBlock {HTML} at (0,0) size 800x581
+ RenderBody {BODY} at (8,8) size 784x565
+layer at (8,8) size 1180x404
+ RenderBlock {DIV} at (0,0) size 784x404 [border: (2px solid #000000)]
+ RenderText {#text} at (2,2) size 110x20
+ text run at (2,2) width 110: "This is some text."
+ RenderBR {BR} at (112,17) size 0x0
+ RenderText {#text} at (2,22) size 110x20
+ text run at (2,22) width 110: "This is some text."
+ RenderBR {BR} at (112,37) size 0x0
+ RenderText {#text} at (2,42) size 110x20
+ text run at (2,42) width 110: "This is some text."
+ RenderBR {BR} at (112,57) size 0x0
+ RenderText {#text} at (2,62) size 110x20
+ text run at (2,62) width 110: "This is some text."
+ RenderBR {BR} at (112,77) size 0x0
+ RenderText {#text} at (2,82) size 110x20
+ text run at (2,82) width 110: "This is some text."
+ RenderBR {BR} at (112,97) size 0x0
+ RenderText {#text} at (2,102) size 110x20
+ text run at (2,102) width 110: "This is some text."
+ RenderBR {BR} at (112,117) size 0x0
+ RenderText {#text} at (2,122) size 110x20
+ text run at (2,122) width 110: "This is some text."
+ RenderBR {BR} at (112,137) size 0x0
+ RenderText {#text} at (2,142) size 110x20
+ text run at (2,142) width 110: "This is some text."
+ RenderBR {BR} at (112,157) size 0x0
+ RenderText {#text} at (2,162) size 110x20
+ text run at (2,162) width 110: "This is some text."
+ RenderBR {BR} at (112,177) size 0x0
+ RenderText {#text} at (2,182) size 110x20
+ text run at (2,182) width 110: "This is some text."
+ RenderBR {BR} at (112,197) size 0x0
+ RenderImage {IMG} at (2,402) size 250x300 [bgcolor=#008000]
+ RenderText {#text} at (252,402) size 110x20
+ text run at (252,402) width 110: "This is some text."
+ RenderBR {BR} at (362,417) size 0x0
+ RenderText {#text} at (252,422) size 110x20
+ text run at (252,422) width 110: "This is some text."
+ RenderBR {BR} at (362,437) size 0x0
+ RenderText {#text} at (252,442) size 110x20
+ text run at (252,442) width 110: "This is some text."
+ RenderBR {BR} at (362,457) size 0x0
+ RenderText {#text} at (252,462) size 110x20
+ text run at (252,462) width 110: "This is some text."
+ RenderBR {BR} at (362,477) size 0x0
+ RenderText {#text} at (252,482) size 110x20
+ text run at (252,482) width 110: "This is some text."
+ RenderBR {BR} at (362,497) size 0x0
+ RenderText {#text} at (252,502) size 110x20
+ text run at (252,502) width 110: "This is some text."
+ RenderBR {BR} at (362,517) size 0x0
+ RenderText {#text} at (252,522) size 110x20
+ text run at (252,522) width 110: "This is some text."
+ RenderBR {BR} at (362,537) size 0x0
+ RenderText {#text} at (252,542) size 110x20
+ text run at (252,542) width 110: "This is some text."
+ RenderBR {BR} at (362,557) size 0x0
+ RenderText {#text} at (252,562) size 110x20
+ text run at (252,562) width 110: "This is some text."
+ RenderBR {BR} at (362,577) size 0x0
+ RenderText {#text} at (252,582) size 110x20
+ text run at (252,582) width 110: "This is some text."
+ RenderBR {BR} at (362,597) size 0x0
+ RenderText {#text} at (252,602) size 110x20
+ text run at (252,602) width 110: "This is some text."
+ RenderBR {BR} at (362,617) size 0x0
+ RenderText {#text} at (252,622) size 110x20
+ text run at (252,622) width 110: "This is some text."
+ RenderBR {BR} at (362,637) size 0x0
+ RenderText {#text} at (252,642) size 110x20
+ text run at (252,642) width 110: "This is some text."
+ RenderBR {BR} at (362,657) size 0x0
+ RenderText {#text} at (252,662) size 110x20
+ text run at (252,662) width 110: "This is some text."
+ RenderBR {BR} at (362,677) size 0x0
+ RenderText {#text} at (252,682) size 110x20
+ text run at (252,682) width 110: "This is some text."
+ RenderBR {BR} at (362,697) size 0x0
+ RenderText {#text} at (2,702) size 110x20
+ text run at (2,702) width 110: "This is some text."
+ RenderBR {BR} at (112,717) size 0x0
+ RenderText {#text} at (2,722) size 110x20
+ text run at (2,722) width 110: "This is some text."
+ RenderBR {BR} at (112,737) size 0x0
+ RenderText {#text} at (2,742) size 110x20
+ text run at (2,742) width 110: "This is some text."
+ RenderBR {BR} at (112,757) size 0x0
+ RenderText {#text} at (2,762) size 110x20
+ text run at (2,762) width 110: "This is some text."
+ RenderBR {BR} at (112,777) size 0x0
+ RenderText {#text} at (2,782) size 110x20
+ text run at (2,782) width 110: "This is some text."
+ RenderBR {BR} at (112,797) size 0x0
+ RenderText {#text} at (2,802) size 110x20
+ text run at (2,802) width 110: "This is some text."
+ RenderBR {BR} at (112,817) size 0x0
+ RenderText {#text} at (2,822) size 110x20
+ text run at (2,822) width 110: "This is some text."
+ RenderBR {BR} at (112,837) size 0x0
+ RenderText {#text} at (2,842) size 110x20
+ text run at (2,842) width 110: "This is some text."
+ RenderBR {BR} at (112,857) size 0x0
+ RenderText {#text} at (2,862) size 110x20
+ text run at (2,862) width 110: "This is some text."
+ RenderBR {BR} at (112,877) size 0x0
+ RenderText {#text} at (2,882) size 110x20
+ text run at (2,882) width 110: "This is some text."
+ RenderBR {BR} at (112,897) size 0x0
+ RenderText {#text} at (2,902) size 110x20
+ text run at (2,902) width 110: "This is some text."
+ RenderBR {BR} at (112,917) size 0x0
+ RenderText {#text} at (2,922) size 110x20
+ text run at (2,922) width 110: "This is some text."
+ RenderBR {BR} at (112,937) size 0x0
+ RenderText {#text} at (2,942) size 110x20
+ text run at (2,942) width 110: "This is some text."
+ RenderBR {BR} at (112,957) size 0x0
+ RenderText {#text} at (2,962) size 110x20
+ text run at (2,962) width 110: "This is some text."
+ RenderBR {BR} at (112,977) size 0x0
+ RenderText {#text} at (2,982) size 110x20
+ text run at (2,982) width 110: "This is some text."
+ RenderBR {BR} at (112,997) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/layers-in-multicol-expected.txt b/LayoutTests/platform/gtk/fast/multicol/layers-in-multicol-expected.txt
index e10c5e3..9d6ffe7 100644
--- a/LayoutTests/platform/gtk/fast/multicol/layers-in-multicol-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/layers-in-multicol-expected.txt
@@ -53,7 +53,7 @@ layer at (8,28) size 1274x310
RenderBR {BR} at (106,255) size 0x0
RenderBlock {DIV} at (5,265) size 241x270
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,535) size 241x560
+ RenderBlock (anonymous) at (5,535) size 241x570
RenderText {#text} at (0,0) size 106x20
text run at (0,0) width 106: "This is some text"
RenderBR {BR} at (106,15) size 0x0
@@ -63,80 +63,80 @@ layer at (8,28) size 1274x310
RenderText {#text} at (0,40) size 106x20
text run at (0,40) width 106: "This is some text"
RenderBR {BR} at (106,55) size 0x0
- RenderText {#text} at (0,60) size 106x20
- text run at (0,60) width 106: "This is some text"
- RenderBR {BR} at (106,75) size 0x0
- RenderText {#text} at (0,80) size 106x20
- text run at (0,80) width 106: "This is some text"
- RenderBR {BR} at (106,95) size 0x0
- RenderText {#text} at (0,100) size 106x20
- text run at (0,100) width 106: "This is some text"
- RenderBR {BR} at (106,115) size 0x0
- RenderText {#text} at (0,120) size 106x20
- text run at (0,120) width 106: "This is some text"
- RenderBR {BR} at (106,135) size 0x0
- RenderText {#text} at (0,140) size 106x20
- text run at (0,140) width 106: "This is some text"
- RenderBR {BR} at (106,155) size 0x0
- RenderText {#text} at (0,160) size 106x20
- text run at (0,160) width 106: "This is some text"
- RenderBR {BR} at (106,175) size 0x0
- RenderText {#text} at (0,180) size 106x20
- text run at (0,180) width 106: "This is some text"
- RenderBR {BR} at (106,195) size 0x0
- RenderText {#text} at (0,200) size 106x20
- text run at (0,200) width 106: "This is some text"
- RenderBR {BR} at (106,215) size 0x0
- RenderText {#text} at (0,220) size 106x20
- text run at (0,220) width 106: "This is some text"
- RenderBR {BR} at (106,235) size 0x0
- RenderText {#text} at (0,240) size 106x20
- text run at (0,240) width 106: "This is some text"
- RenderBR {BR} at (106,255) size 0x0
- RenderText {#text} at (0,260) size 106x20
- text run at (0,260) width 106: "This is some text"
- RenderBR {BR} at (106,275) size 0x0
- RenderText {#text} at (0,280) size 106x20
- text run at (0,280) width 106: "This is some text"
- RenderBR {BR} at (106,295) size 0x0
- RenderText {#text} at (0,300) size 106x20
- text run at (0,300) width 106: "This is some text"
- RenderBR {BR} at (106,315) size 0x0
- RenderText {#text} at (0,320) size 106x20
- text run at (0,320) width 106: "This is some text"
- RenderBR {BR} at (106,335) size 0x0
- RenderText {#text} at (0,340) size 106x20
- text run at (0,340) width 106: "This is some text"
- RenderBR {BR} at (106,355) size 0x0
- RenderText {#text} at (0,360) size 106x20
- text run at (0,360) width 106: "This is some text"
- RenderBR {BR} at (106,375) size 0x0
- RenderText {#text} at (0,380) size 106x20
- text run at (0,380) width 106: "This is some text"
- RenderBR {BR} at (106,395) size 0x0
- RenderText {#text} at (0,400) size 106x20
- text run at (0,400) width 106: "This is some text"
- RenderBR {BR} at (106,415) size 0x0
- RenderText {#text} at (0,420) size 106x20
- text run at (0,420) width 106: "This is some text"
- RenderBR {BR} at (106,435) size 0x0
- RenderText {#text} at (0,440) size 106x20
- text run at (0,440) width 106: "This is some text"
- RenderBR {BR} at (106,455) size 0x0
- RenderText {#text} at (0,460) size 106x20
- text run at (0,460) width 106: "This is some text"
- RenderBR {BR} at (106,475) size 0x0
- RenderText {#text} at (0,480) size 106x20
- text run at (0,480) width 106: "This is some text"
- RenderBR {BR} at (106,495) size 0x0
- RenderText {#text} at (0,500) size 106x20
- text run at (0,500) width 106: "This is some text"
- RenderBR {BR} at (106,515) size 0x0
- RenderText {#text} at (0,520) size 106x20
- text run at (0,520) width 106: "This is some text"
- RenderBR {BR} at (106,535) size 0x0
+ RenderText {#text} at (0,70) size 106x20
+ text run at (0,70) width 106: "This is some text"
+ RenderBR {BR} at (106,85) size 0x0
+ RenderText {#text} at (0,90) size 106x20
+ text run at (0,90) width 106: "This is some text"
+ RenderBR {BR} at (106,105) size 0x0
+ RenderText {#text} at (0,110) size 106x20
+ text run at (0,110) width 106: "This is some text"
+ RenderBR {BR} at (106,125) size 0x0
+ RenderText {#text} at (0,130) size 106x20
+ text run at (0,130) width 106: "This is some text"
+ RenderBR {BR} at (106,145) size 0x0
+ RenderText {#text} at (0,150) size 106x20
+ text run at (0,150) width 106: "This is some text"
+ RenderBR {BR} at (106,165) size 0x0
+ RenderText {#text} at (0,170) size 106x20
+ text run at (0,170) width 106: "This is some text"
+ RenderBR {BR} at (106,185) size 0x0
+ RenderText {#text} at (0,190) size 106x20
+ text run at (0,190) width 106: "This is some text"
+ RenderBR {BR} at (106,205) size 0x0
+ RenderText {#text} at (0,210) size 106x20
+ text run at (0,210) width 106: "This is some text"
+ RenderBR {BR} at (106,225) size 0x0
+ RenderText {#text} at (0,230) size 106x20
+ text run at (0,230) width 106: "This is some text"
+ RenderBR {BR} at (106,245) size 0x0
+ RenderText {#text} at (0,250) size 106x20
+ text run at (0,250) width 106: "This is some text"
+ RenderBR {BR} at (106,265) size 0x0
+ RenderText {#text} at (0,270) size 106x20
+ text run at (0,270) width 106: "This is some text"
+ RenderBR {BR} at (106,285) size 0x0
+ RenderText {#text} at (0,290) size 106x20
+ text run at (0,290) width 106: "This is some text"
+ RenderBR {BR} at (106,305) size 0x0
+ RenderText {#text} at (0,310) size 106x20
+ text run at (0,310) width 106: "This is some text"
+ RenderBR {BR} at (106,325) size 0x0
+ RenderText {#text} at (0,330) size 106x20
+ text run at (0,330) width 106: "This is some text"
+ RenderBR {BR} at (106,345) size 0x0
+ RenderText {#text} at (0,350) size 106x20
+ text run at (0,350) width 106: "This is some text"
+ RenderBR {BR} at (106,365) size 0x0
+ RenderText {#text} at (0,370) size 106x20
+ text run at (0,370) width 106: "This is some text"
+ RenderBR {BR} at (106,385) size 0x0
+ RenderText {#text} at (0,390) size 106x20
+ text run at (0,390) width 106: "This is some text"
+ RenderBR {BR} at (106,405) size 0x0
+ RenderText {#text} at (0,410) size 106x20
+ text run at (0,410) width 106: "This is some text"
+ RenderBR {BR} at (106,425) size 0x0
+ RenderText {#text} at (0,430) size 106x20
+ text run at (0,430) width 106: "This is some text"
+ RenderBR {BR} at (106,445) size 0x0
+ RenderText {#text} at (0,450) size 106x20
+ text run at (0,450) width 106: "This is some text"
+ RenderBR {BR} at (106,465) size 0x0
+ RenderText {#text} at (0,470) size 106x20
+ text run at (0,470) width 106: "This is some text"
+ RenderBR {BR} at (106,485) size 0x0
+ RenderText {#text} at (0,490) size 106x20
+ text run at (0,490) width 106: "This is some text"
+ RenderBR {BR} at (106,505) size 0x0
+ RenderText {#text} at (0,510) size 106x20
+ text run at (0,510) width 106: "This is some text"
+ RenderBR {BR} at (106,525) size 0x0
+ RenderText {#text} at (0,530) size 106x20
+ text run at (0,530) width 106: "This is some text"
+ RenderBR {BR} at (106,545) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,1115) size 241x280
+ RenderBlock (anonymous) at (5,1125) size 241x280
RenderText {#text} at (0,0) size 106x20
text run at (0,0) width 106: "This is some text"
RenderBR {BR} at (106,15) size 0x0
@@ -223,7 +223,7 @@ layer at (8,358) size 765x310
RenderBR {BR} at (135,255) size 0x0
RenderBlock {DIV} at (5,265) size 241x270
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,535) size 241x560
+ RenderBlock (anonymous) at (5,535) size 241x570
RenderText {#text} at (135,0) size 106x20
text run at (135,0) width 106: "This is some text"
RenderBR {BR} at (135,15) size 0x0
@@ -233,80 +233,80 @@ layer at (8,358) size 765x310
RenderText {#text} at (135,40) size 106x20
text run at (135,40) width 106: "This is some text"
RenderBR {BR} at (135,55) size 0x0
- RenderText {#text} at (135,60) size 106x20
- text run at (135,60) width 106: "This is some text"
- RenderBR {BR} at (135,75) size 0x0
- RenderText {#text} at (135,80) size 106x20
- text run at (135,80) width 106: "This is some text"
- RenderBR {BR} at (135,95) size 0x0
- RenderText {#text} at (135,100) size 106x20
- text run at (135,100) width 106: "This is some text"
- RenderBR {BR} at (135,115) size 0x0
- RenderText {#text} at (135,120) size 106x20
- text run at (135,120) width 106: "This is some text"
- RenderBR {BR} at (135,135) size 0x0
- RenderText {#text} at (135,140) size 106x20
- text run at (135,140) width 106: "This is some text"
- RenderBR {BR} at (135,155) size 0x0
- RenderText {#text} at (135,160) size 106x20
- text run at (135,160) width 106: "This is some text"
- RenderBR {BR} at (135,175) size 0x0
- RenderText {#text} at (135,180) size 106x20
- text run at (135,180) width 106: "This is some text"
- RenderBR {BR} at (135,195) size 0x0
- RenderText {#text} at (135,200) size 106x20
- text run at (135,200) width 106: "This is some text"
- RenderBR {BR} at (135,215) size 0x0
- RenderText {#text} at (135,220) size 106x20
- text run at (135,220) width 106: "This is some text"
- RenderBR {BR} at (135,235) size 0x0
- RenderText {#text} at (135,240) size 106x20
- text run at (135,240) width 106: "This is some text"
- RenderBR {BR} at (135,255) size 0x0
- RenderText {#text} at (135,260) size 106x20
- text run at (135,260) width 106: "This is some text"
- RenderBR {BR} at (135,275) size 0x0
- RenderText {#text} at (135,280) size 106x20
- text run at (135,280) width 106: "This is some text"
- RenderBR {BR} at (135,295) size 0x0
- RenderText {#text} at (135,300) size 106x20
- text run at (135,300) width 106: "This is some text"
- RenderBR {BR} at (135,315) size 0x0
- RenderText {#text} at (135,320) size 106x20
- text run at (135,320) width 106: "This is some text"
- RenderBR {BR} at (135,335) size 0x0
- RenderText {#text} at (135,340) size 106x20
- text run at (135,340) width 106: "This is some text"
- RenderBR {BR} at (135,355) size 0x0
- RenderText {#text} at (135,360) size 106x20
- text run at (135,360) width 106: "This is some text"
- RenderBR {BR} at (135,375) size 0x0
- RenderText {#text} at (135,380) size 106x20
- text run at (135,380) width 106: "This is some text"
- RenderBR {BR} at (135,395) size 0x0
- RenderText {#text} at (135,400) size 106x20
- text run at (135,400) width 106: "This is some text"
- RenderBR {BR} at (135,415) size 0x0
- RenderText {#text} at (135,420) size 106x20
- text run at (135,420) width 106: "This is some text"
- RenderBR {BR} at (135,435) size 0x0
- RenderText {#text} at (135,440) size 106x20
- text run at (135,440) width 106: "This is some text"
- RenderBR {BR} at (135,455) size 0x0
- RenderText {#text} at (135,460) size 106x20
- text run at (135,460) width 106: "This is some text"
- RenderBR {BR} at (135,475) size 0x0
- RenderText {#text} at (135,480) size 106x20
- text run at (135,480) width 106: "This is some text"
- RenderBR {BR} at (135,495) size 0x0
- RenderText {#text} at (135,500) size 106x20
- text run at (135,500) width 106: "This is some text"
- RenderBR {BR} at (135,515) size 0x0
- RenderText {#text} at (135,520) size 106x20
- text run at (135,520) width 106: "This is some text"
- RenderBR {BR} at (135,535) size 0x0
+ RenderText {#text} at (135,70) size 106x20
+ text run at (135,70) width 106: "This is some text"
+ RenderBR {BR} at (135,85) size 0x0
+ RenderText {#text} at (135,90) size 106x20
+ text run at (135,90) width 106: "This is some text"
+ RenderBR {BR} at (135,105) size 0x0
+ RenderText {#text} at (135,110) size 106x20
+ text run at (135,110) width 106: "This is some text"
+ RenderBR {BR} at (135,125) size 0x0
+ RenderText {#text} at (135,130) size 106x20
+ text run at (135,130) width 106: "This is some text"
+ RenderBR {BR} at (135,145) size 0x0
+ RenderText {#text} at (135,150) size 106x20
+ text run at (135,150) width 106: "This is some text"
+ RenderBR {BR} at (135,165) size 0x0
+ RenderText {#text} at (135,170) size 106x20
+ text run at (135,170) width 106: "This is some text"
+ RenderBR {BR} at (135,185) size 0x0
+ RenderText {#text} at (135,190) size 106x20
+ text run at (135,190) width 106: "This is some text"
+ RenderBR {BR} at (135,205) size 0x0
+ RenderText {#text} at (135,210) size 106x20
+ text run at (135,210) width 106: "This is some text"
+ RenderBR {BR} at (135,225) size 0x0
+ RenderText {#text} at (135,230) size 106x20
+ text run at (135,230) width 106: "This is some text"
+ RenderBR {BR} at (135,245) size 0x0
+ RenderText {#text} at (135,250) size 106x20
+ text run at (135,250) width 106: "This is some text"
+ RenderBR {BR} at (135,265) size 0x0
+ RenderText {#text} at (135,270) size 106x20
+ text run at (135,270) width 106: "This is some text"
+ RenderBR {BR} at (135,285) size 0x0
+ RenderText {#text} at (135,290) size 106x20
+ text run at (135,290) width 106: "This is some text"
+ RenderBR {BR} at (135,305) size 0x0
+ RenderText {#text} at (135,310) size 106x20
+ text run at (135,310) width 106: "This is some text"
+ RenderBR {BR} at (135,325) size 0x0
+ RenderText {#text} at (135,330) size 106x20
+ text run at (135,330) width 106: "This is some text"
+ RenderBR {BR} at (135,345) size 0x0
+ RenderText {#text} at (135,350) size 106x20
+ text run at (135,350) width 106: "This is some text"
+ RenderBR {BR} at (135,365) size 0x0
+ RenderText {#text} at (135,370) size 106x20
+ text run at (135,370) width 106: "This is some text"
+ RenderBR {BR} at (135,385) size 0x0
+ RenderText {#text} at (135,390) size 106x20
+ text run at (135,390) width 106: "This is some text"
+ RenderBR {BR} at (135,405) size 0x0
+ RenderText {#text} at (135,410) size 106x20
+ text run at (135,410) width 106: "This is some text"
+ RenderBR {BR} at (135,425) size 0x0
+ RenderText {#text} at (135,430) size 106x20
+ text run at (135,430) width 106: "This is some text"
+ RenderBR {BR} at (135,445) size 0x0
+ RenderText {#text} at (135,450) size 106x20
+ text run at (135,450) width 106: "This is some text"
+ RenderBR {BR} at (135,465) size 0x0
+ RenderText {#text} at (135,470) size 106x20
+ text run at (135,470) width 106: "This is some text"
+ RenderBR {BR} at (135,485) size 0x0
+ RenderText {#text} at (135,490) size 106x20
+ text run at (135,490) width 106: "This is some text"
+ RenderBR {BR} at (135,505) size 0x0
+ RenderText {#text} at (135,510) size 106x20
+ text run at (135,510) width 106: "This is some text"
+ RenderBR {BR} at (135,525) size 0x0
+ RenderText {#text} at (135,530) size 106x20
+ text run at (135,530) width 106: "This is some text"
+ RenderBR {BR} at (135,545) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (5,1115) size 241x280
+ RenderBlock (anonymous) at (5,1125) size 241x280
RenderText {#text} at (135,0) size 106x20
text run at (135,0) width 106: "This is some text"
RenderBR {BR} at (135,15) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/margin-collapse-expected.txt b/LayoutTests/platform/gtk/fast/multicol/margin-collapse-expected.txt
new file mode 100644
index 0000000..1149a6d
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/margin-collapse-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock (anonymous) at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 769x40
+ text run at (0,0) width 480: "The two purple rectangles below should both be at the top of their columns. "
+ text run at (480,0) width 289: "If one is lower than the other, than the test has"
+ text run at (0,20) width 39: "failed."
+layer at (8,48) size 784x304
+ RenderBlock {DIV} at (0,40) size 784x304 [border: (2px solid #000000)]
+ RenderBlock {DIV} at (2,2) size 382x200 [bgcolor=#800080]
+ RenderBlock {DIV} at (2,302) size 382x200 [bgcolor=#800080]
diff --git a/LayoutTests/platform/gtk/fast/multicol/max-height-columns-block-expected.txt b/LayoutTests/platform/gtk/fast/multicol/max-height-columns-block-expected.txt
new file mode 100644
index 0000000..28ab97e
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/max-height-columns-block-expected.txt
@@ -0,0 +1,47 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock (anonymous) at (0,0) size 784x80
+ RenderText {#text} at (0,0) size 768x80
+ text run at (0,0) width 427: "This is capturing current behavior, but it's not clear that it is correct. "
+ text run at (427,0) width 291: "It's not clear if max-height on a columns block"
+ text run at (0,20) width 291: "constitutes a constraint on the columns or not. "
+ text run at (291,20) width 477: "You obviously begin trying to balance, but only run into the constraint once"
+ text run at (0,40) width 290: "the balanced columns exceed the max-height. "
+ text run at (290,40) width 325: "It's not clear that you should suddenly shift to a fill. "
+ text run at (615,40) width 132: "Our current behavior"
+ text run at (0,60) width 512: "(which matches Firefox) is to just overflow without changing from balance to fill."
+layer at (8,88) size 404x64
+ RenderBlock {DIV} at (0,80) size 404x64 [border: (2px solid #000000)]
+ RenderText {#text} at (2,2) size 51x120
+ text run at (2,2) width 43: "This"
+ text run at (2,32) width 16: "is"
+ text run at (2,62) width 51: "some"
+ text run at (2,92) width 37: "text"
+ RenderBR {BR} at (39,115) size 0x0
+ RenderText {#text} at (2,122) size 51x120
+ text run at (2,122) width 43: "This"
+ text run at (2,152) width 16: "is"
+ text run at (2,182) width 51: "some"
+ text run at (2,212) width 37: "text"
+ RenderBR {BR} at (39,235) size 0x0
+ RenderText {#text} at (2,242) size 51x120
+ text run at (2,242) width 43: "This"
+ text run at (2,272) width 16: "is"
+ text run at (2,302) width 51: "some"
+ text run at (2,332) width 37: "text"
+ RenderBR {BR} at (39,355) size 0x0
+ RenderText {#text} at (2,362) size 51x120
+ text run at (2,362) width 43: "This"
+ text run at (2,392) width 16: "is"
+ text run at (2,422) width 51: "some"
+ text run at (2,452) width 37: "text"
+ RenderBR {BR} at (39,475) size 0x0
+ RenderText {#text} at (2,482) size 51x120
+ text run at (2,482) width 43: "This"
+ text run at (2,512) width 16: "is"
+ text run at (2,542) width 51: "some"
+ text run at (2,572) width 37: "text"
+ RenderBR {BR} at (39,595) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt
index d9b0544..fb7f6f7 100644
--- a/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/nested-columns-expected.txt
@@ -23,26 +23,26 @@ layer at (8,8) size 1133x500
RenderBlock {H1} at (0,304) size 367x42
RenderText {#text} at (0,0) size 169x42
text run at (0,0) width 169: "Header Two"
- RenderBlock (anonymous) at (0,367) size 367x220
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock (anonymous) at (0,367) size 367x233
+ RenderText {#text} at (0,0) size 362x233
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {H1} at (0,608) size 367x42
+ text run at (0,133) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,153) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,173) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,193) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,213) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {H1} at (0,621) size 367x42
RenderText {#text} at (0,0) size 190x42
text run at (0,0) width 190: "Header Three"
- RenderBlock {H1} at (0,932) size 367x42
+ RenderBlock {H1} at (0,945) size 367x42
RenderText {#text} at (0,0) size 177x42
text run at (0,0) width 177: "Header Four"
- RenderBlock (anonymous) at (0,995) size 367x40
+ RenderBlock (anonymous) at (0,1000) size 367x40
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
diff --git a/LayoutTests/platform/gtk/fast/multicol/paginate-block-replaced-expected.txt b/LayoutTests/platform/gtk/fast/multicol/paginate-block-replaced-expected.txt
new file mode 100644
index 0000000..7456544
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/paginate-block-replaced-expected.txt
@@ -0,0 +1,130 @@
+layer at (0,0) size 1586x581
+ RenderView at (0,0) size 800x581
+layer at (0,0) size 1586x581
+ RenderBlock {HTML} at (0,0) size 800x581
+ RenderBody {BODY} at (8,8) size 784x565
+layer at (8,8) size 1578x404
+ RenderBlock {DIV} at (0,0) size 784x404 [border: (2px solid #000000)]
+ RenderBlock (anonymous) at (2,2) size 382x200
+ RenderText {#text} at (0,0) size 110x20
+ text run at (0,0) width 110: "This is some text."
+ RenderBR {BR} at (110,15) size 0x0
+ RenderText {#text} at (0,20) size 110x20
+ text run at (0,20) width 110: "This is some text."
+ RenderBR {BR} at (110,35) size 0x0
+ RenderText {#text} at (0,40) size 110x20
+ text run at (0,40) width 110: "This is some text."
+ RenderBR {BR} at (110,55) size 0x0
+ RenderText {#text} at (0,60) size 110x20
+ text run at (0,60) width 110: "This is some text."
+ RenderBR {BR} at (110,75) size 0x0
+ RenderText {#text} at (0,80) size 110x20
+ text run at (0,80) width 110: "This is some text."
+ RenderBR {BR} at (110,95) size 0x0
+ RenderText {#text} at (0,100) size 110x20
+ text run at (0,100) width 110: "This is some text."
+ RenderBR {BR} at (110,115) size 0x0
+ RenderText {#text} at (0,120) size 110x20
+ text run at (0,120) width 110: "This is some text."
+ RenderBR {BR} at (110,135) size 0x0
+ RenderText {#text} at (0,140) size 110x20
+ text run at (0,140) width 110: "This is some text."
+ RenderBR {BR} at (110,155) size 0x0
+ RenderText {#text} at (0,160) size 110x20
+ text run at (0,160) width 110: "This is some text."
+ RenderBR {BR} at (110,175) size 0x0
+ RenderText {#text} at (0,180) size 110x20
+ text run at (0,180) width 110: "This is some text."
+ RenderBR {BR} at (110,195) size 0x0
+ RenderImage {IMG} at (2,402) size 250x300 [bgcolor=#008000]
+ RenderBlock (anonymous) at (2,702) size 382x600
+ RenderText {#text} at (0,0) size 110x20
+ text run at (0,0) width 110: "This is some text."
+ RenderBR {BR} at (110,15) size 0x0
+ RenderText {#text} at (0,20) size 110x20
+ text run at (0,20) width 110: "This is some text."
+ RenderBR {BR} at (110,35) size 0x0
+ RenderText {#text} at (0,40) size 110x20
+ text run at (0,40) width 110: "This is some text."
+ RenderBR {BR} at (110,55) size 0x0
+ RenderText {#text} at (0,60) size 110x20
+ text run at (0,60) width 110: "This is some text."
+ RenderBR {BR} at (110,75) size 0x0
+ RenderText {#text} at (0,80) size 110x20
+ text run at (0,80) width 110: "This is some text."
+ RenderBR {BR} at (110,95) size 0x0
+ RenderText {#text} at (0,100) size 110x20
+ text run at (0,100) width 110: "This is some text."
+ RenderBR {BR} at (110,115) size 0x0
+ RenderText {#text} at (0,120) size 110x20
+ text run at (0,120) width 110: "This is some text."
+ RenderBR {BR} at (110,135) size 0x0
+ RenderText {#text} at (0,140) size 110x20
+ text run at (0,140) width 110: "This is some text."
+ RenderBR {BR} at (110,155) size 0x0
+ RenderText {#text} at (0,160) size 110x20
+ text run at (0,160) width 110: "This is some text."
+ RenderBR {BR} at (110,175) size 0x0
+ RenderText {#text} at (0,180) size 110x20
+ text run at (0,180) width 110: "This is some text."
+ RenderBR {BR} at (110,195) size 0x0
+ RenderText {#text} at (0,200) size 110x20
+ text run at (0,200) width 110: "This is some text."
+ RenderBR {BR} at (110,215) size 0x0
+ RenderText {#text} at (0,220) size 110x20
+ text run at (0,220) width 110: "This is some text."
+ RenderBR {BR} at (110,235) size 0x0
+ RenderText {#text} at (0,240) size 110x20
+ text run at (0,240) width 110: "This is some text."
+ RenderBR {BR} at (110,255) size 0x0
+ RenderText {#text} at (0,260) size 110x20
+ text run at (0,260) width 110: "This is some text."
+ RenderBR {BR} at (110,275) size 0x0
+ RenderText {#text} at (0,280) size 110x20
+ text run at (0,280) width 110: "This is some text."
+ RenderBR {BR} at (110,295) size 0x0
+ RenderText {#text} at (0,300) size 110x20
+ text run at (0,300) width 110: "This is some text."
+ RenderBR {BR} at (110,315) size 0x0
+ RenderText {#text} at (0,320) size 110x20
+ text run at (0,320) width 110: "This is some text."
+ RenderBR {BR} at (110,335) size 0x0
+ RenderText {#text} at (0,340) size 110x20
+ text run at (0,340) width 110: "This is some text."
+ RenderBR {BR} at (110,355) size 0x0
+ RenderText {#text} at (0,360) size 110x20
+ text run at (0,360) width 110: "This is some text."
+ RenderBR {BR} at (110,375) size 0x0
+ RenderText {#text} at (0,380) size 110x20
+ text run at (0,380) width 110: "This is some text."
+ RenderBR {BR} at (110,395) size 0x0
+ RenderText {#text} at (0,400) size 110x20
+ text run at (0,400) width 110: "This is some text."
+ RenderBR {BR} at (110,415) size 0x0
+ RenderText {#text} at (0,420) size 110x20
+ text run at (0,420) width 110: "This is some text."
+ RenderBR {BR} at (110,435) size 0x0
+ RenderText {#text} at (0,440) size 110x20
+ text run at (0,440) width 110: "This is some text."
+ RenderBR {BR} at (110,455) size 0x0
+ RenderText {#text} at (0,460) size 110x20
+ text run at (0,460) width 110: "This is some text."
+ RenderBR {BR} at (110,475) size 0x0
+ RenderText {#text} at (0,480) size 110x20
+ text run at (0,480) width 110: "This is some text."
+ RenderBR {BR} at (110,495) size 0x0
+ RenderText {#text} at (0,500) size 110x20
+ text run at (0,500) width 110: "This is some text."
+ RenderBR {BR} at (110,515) size 0x0
+ RenderText {#text} at (0,520) size 110x20
+ text run at (0,520) width 110: "This is some text."
+ RenderBR {BR} at (110,535) size 0x0
+ RenderText {#text} at (0,540) size 110x20
+ text run at (0,540) width 110: "This is some text."
+ RenderBR {BR} at (110,555) size 0x0
+ RenderText {#text} at (0,560) size 110x20
+ text run at (0,560) width 110: "This is some text."
+ RenderBR {BR} at (110,575) size 0x0
+ RenderText {#text} at (0,580) size 110x20
+ text run at (0,580) width 110: "This is some text."
+ RenderBR {BR} at (110,595) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/positioned-split-expected.txt b/LayoutTests/platform/gtk/fast/multicol/positioned-split-expected.txt
new file mode 100644
index 0000000..17ee05f
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/positioned-split-expected.txt
@@ -0,0 +1,26 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+layer at (8,8) size 784x304
+ RenderBlock {DIV} at (0,0) size 784x304 [border: (2px solid #000000)]
+ RenderBlock {DIV} at (2,2) size 382x250
+ RenderBlock {DIV} at (2,252) size 382x250
+layer at (10,260) size 300x200
+ RenderBlock (positioned) {DIV} at (0,0) size 300x200 [bgcolor=#D3D3D3]
+ RenderText {#text} at (0,0) size 285x20
+ text run at (0,0) width 285: "This text should paginate across the columns."
+ RenderBR {BR} at (285,15) size 0x0
+ RenderText {#text} at (0,20) size 285x20
+ text run at (0,20) width 285: "This text should paginate across the columns."
+ RenderBR {BR} at (285,35) size 0x0
+ RenderText {#text} at (0,50) size 285x20
+ text run at (0,50) width 285: "This text should paginate across the columns."
+ RenderBR {BR} at (285,65) size 0x0
+ RenderText {#text} at (0,70) size 285x20
+ text run at (0,70) width 285: "This text should paginate across the columns."
+ RenderBR {BR} at (285,85) size 0x0
+ RenderText {#text} at (0,90) size 285x20
+ text run at (0,90) width 285: "This text should paginate across the columns."
+ RenderBR {BR} at (285,105) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/positioned-with-constrained-height-expected.txt b/LayoutTests/platform/gtk/fast/multicol/positioned-with-constrained-height-expected.txt
new file mode 100644
index 0000000..ab61bef
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/positioned-with-constrained-height-expected.txt
@@ -0,0 +1,412 @@
+layer at (0,0) size 1090x581
+ RenderView at (0,0) size 800x581
+layer at (0,0) size 800x581
+ RenderBlock {HTML} at (0,0) size 800x581
+ RenderBody {BODY} at (8,8) size 784x565
+layer at (8,8) size 1082x300
+ RenderBlock (positioned) {DIV} at (8,8) size 106x300 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 106x20
+ text run at (0,0) width 106: "This is some text"
+ RenderBR {BR} at (106,15) size 0x0
+ RenderText {#text} at (0,20) size 106x20
+ text run at (0,20) width 106: "This is some text"
+ RenderBR {BR} at (106,35) size 0x0
+ RenderText {#text} at (0,40) size 106x20
+ text run at (0,40) width 106: "This is some text"
+ RenderBR {BR} at (106,55) size 0x0
+ RenderText {#text} at (0,60) size 106x20
+ text run at (0,60) width 106: "This is some text"
+ RenderBR {BR} at (106,75) size 0x0
+ RenderText {#text} at (0,80) size 106x20
+ text run at (0,80) width 106: "This is some text"
+ RenderBR {BR} at (106,95) size 0x0
+ RenderText {#text} at (0,100) size 106x20
+ text run at (0,100) width 106: "This is some text"
+ RenderBR {BR} at (106,115) size 0x0
+ RenderText {#text} at (0,120) size 106x20
+ text run at (0,120) width 106: "This is some text"
+ RenderBR {BR} at (106,135) size 0x0
+ RenderText {#text} at (0,140) size 106x20
+ text run at (0,140) width 106: "This is some text"
+ RenderBR {BR} at (106,155) size 0x0
+ RenderText {#text} at (0,160) size 106x20
+ text run at (0,160) width 106: "This is some text"
+ RenderBR {BR} at (106,175) size 0x0
+ RenderText {#text} at (0,180) size 106x20
+ text run at (0,180) width 106: "This is some text"
+ RenderBR {BR} at (106,195) size 0x0
+ RenderText {#text} at (0,200) size 106x20
+ text run at (0,200) width 106: "This is some text"
+ RenderBR {BR} at (106,215) size 0x0
+ RenderText {#text} at (0,220) size 106x20
+ text run at (0,220) width 106: "This is some text"
+ RenderBR {BR} at (106,235) size 0x0
+ RenderText {#text} at (0,240) size 106x20
+ text run at (0,240) width 106: "This is some text"
+ RenderBR {BR} at (106,255) size 0x0
+ RenderText {#text} at (0,260) size 106x20
+ text run at (0,260) width 106: "This is some text"
+ RenderBR {BR} at (106,275) size 0x0
+ RenderText {#text} at (0,280) size 106x20
+ text run at (0,280) width 106: "This is some text"
+ RenderBR {BR} at (106,295) size 0x0
+ RenderText {#text} at (0,300) size 106x20
+ text run at (0,300) width 106: "This is some text"
+ RenderBR {BR} at (106,315) size 0x0
+ RenderText {#text} at (0,320) size 106x20
+ text run at (0,320) width 106: "This is some text"
+ RenderBR {BR} at (106,335) size 0x0
+ RenderText {#text} at (0,340) size 106x20
+ text run at (0,340) width 106: "This is some text"
+ RenderBR {BR} at (106,355) size 0x0
+ RenderText {#text} at (0,360) size 106x20
+ text run at (0,360) width 106: "This is some text"
+ RenderBR {BR} at (106,375) size 0x0
+ RenderText {#text} at (0,380) size 106x20
+ text run at (0,380) width 106: "This is some text"
+ RenderBR {BR} at (106,395) size 0x0
+ RenderText {#text} at (0,400) size 106x20
+ text run at (0,400) width 106: "This is some text"
+ RenderBR {BR} at (106,415) size 0x0
+ RenderText {#text} at (0,420) size 106x20
+ text run at (0,420) width 106: "This is some text"
+ RenderBR {BR} at (106,435) size 0x0
+ RenderText {#text} at (0,440) size 106x20
+ text run at (0,440) width 106: "This is some text"
+ RenderBR {BR} at (106,455) size 0x0
+ RenderText {#text} at (0,460) size 106x20
+ text run at (0,460) width 106: "This is some text"
+ RenderBR {BR} at (106,475) size 0x0
+ RenderText {#text} at (0,480) size 106x20
+ text run at (0,480) width 106: "This is some text"
+ RenderBR {BR} at (106,495) size 0x0
+ RenderText {#text} at (0,500) size 106x20
+ text run at (0,500) width 106: "This is some text"
+ RenderBR {BR} at (106,515) size 0x0
+ RenderText {#text} at (0,520) size 106x20
+ text run at (0,520) width 106: "This is some text"
+ RenderBR {BR} at (106,535) size 0x0
+ RenderText {#text} at (0,540) size 106x20
+ text run at (0,540) width 106: "This is some text"
+ RenderBR {BR} at (106,555) size 0x0
+ RenderText {#text} at (0,560) size 106x20
+ text run at (0,560) width 106: "This is some text"
+ RenderBR {BR} at (106,575) size 0x0
+ RenderText {#text} at (0,580) size 106x20
+ text run at (0,580) width 106: "This is some text"
+ RenderBR {BR} at (106,595) size 0x0
+ RenderText {#text} at (0,600) size 106x20
+ text run at (0,600) width 106: "This is some text"
+ RenderBR {BR} at (106,615) size 0x0
+ RenderText {#text} at (0,620) size 106x20
+ text run at (0,620) width 106: "This is some text"
+ RenderBR {BR} at (106,635) size 0x0
+ RenderText {#text} at (0,640) size 106x20
+ text run at (0,640) width 106: "This is some text"
+ RenderBR {BR} at (106,655) size 0x0
+ RenderText {#text} at (0,660) size 106x20
+ text run at (0,660) width 106: "This is some text"
+ RenderBR {BR} at (106,675) size 0x0
+ RenderText {#text} at (0,680) size 106x20
+ text run at (0,680) width 106: "This is some text"
+ RenderBR {BR} at (106,695) size 0x0
+ RenderText {#text} at (0,700) size 106x20
+ text run at (0,700) width 106: "This is some text"
+ RenderBR {BR} at (106,715) size 0x0
+ RenderText {#text} at (0,720) size 106x20
+ text run at (0,720) width 106: "This is some text"
+ RenderBR {BR} at (106,735) size 0x0
+ RenderText {#text} at (0,740) size 106x20
+ text run at (0,740) width 106: "This is some text"
+ RenderBR {BR} at (106,755) size 0x0
+ RenderText {#text} at (0,760) size 106x20
+ text run at (0,760) width 106: "This is some text"
+ RenderBR {BR} at (106,775) size 0x0
+ RenderText {#text} at (0,780) size 106x20
+ text run at (0,780) width 106: "This is some text"
+ RenderBR {BR} at (106,795) size 0x0
+ RenderText {#text} at (0,800) size 106x20
+ text run at (0,800) width 106: "This is some text"
+ RenderBR {BR} at (106,815) size 0x0
+ RenderText {#text} at (0,820) size 106x20
+ text run at (0,820) width 106: "This is some text"
+ RenderBR {BR} at (106,835) size 0x0
+ RenderText {#text} at (0,840) size 106x20
+ text run at (0,840) width 106: "This is some text"
+ RenderBR {BR} at (106,855) size 0x0
+ RenderText {#text} at (0,860) size 106x20
+ text run at (0,860) width 106: "This is some text"
+ RenderBR {BR} at (106,875) size 0x0
+ RenderText {#text} at (0,880) size 106x20
+ text run at (0,880) width 106: "This is some text"
+ RenderBR {BR} at (106,895) size 0x0
+ RenderText {#text} at (0,900) size 106x20
+ text run at (0,900) width 106: "This is some text"
+ RenderBR {BR} at (106,915) size 0x0
+ RenderText {#text} at (0,920) size 106x20
+ text run at (0,920) width 106: "This is some text"
+ RenderBR {BR} at (106,935) size 0x0
+ RenderText {#text} at (0,940) size 106x20
+ text run at (0,940) width 106: "This is some text"
+ RenderBR {BR} at (106,955) size 0x0
+ RenderText {#text} at (0,960) size 106x20
+ text run at (0,960) width 106: "This is some text"
+ RenderBR {BR} at (106,975) size 0x0
+ RenderText {#text} at (0,980) size 106x20
+ text run at (0,980) width 106: "This is some text"
+ RenderBR {BR} at (106,995) size 0x0
+ RenderText {#text} at (0,1000) size 106x20
+ text run at (0,1000) width 106: "This is some text"
+ RenderBR {BR} at (106,1015) size 0x0
+ RenderText {#text} at (0,1020) size 106x20
+ text run at (0,1020) width 106: "This is some text"
+ RenderBR {BR} at (106,1035) size 0x0
+ RenderText {#text} at (0,1040) size 106x20
+ text run at (0,1040) width 106: "This is some text"
+ RenderBR {BR} at (106,1055) size 0x0
+ RenderText {#text} at (0,1060) size 106x20
+ text run at (0,1060) width 106: "This is some text"
+ RenderBR {BR} at (106,1075) size 0x0
+ RenderText {#text} at (0,1080) size 106x20
+ text run at (0,1080) width 106: "This is some text"
+ RenderBR {BR} at (106,1095) size 0x0
+ RenderText {#text} at (0,1100) size 106x20
+ text run at (0,1100) width 106: "This is some text"
+ RenderBR {BR} at (106,1115) size 0x0
+ RenderText {#text} at (0,1120) size 106x20
+ text run at (0,1120) width 106: "This is some text"
+ RenderBR {BR} at (106,1135) size 0x0
+ RenderText {#text} at (0,1140) size 106x20
+ text run at (0,1140) width 106: "This is some text"
+ RenderBR {BR} at (106,1155) size 0x0
+ RenderText {#text} at (0,1160) size 106x20
+ text run at (0,1160) width 106: "This is some text"
+ RenderBR {BR} at (106,1175) size 0x0
+ RenderText {#text} at (0,1180) size 106x20
+ text run at (0,1180) width 106: "This is some text"
+ RenderBR {BR} at (106,1195) size 0x0
+ RenderText {#text} at (0,1200) size 106x20
+ text run at (0,1200) width 106: "This is some text"
+ RenderBR {BR} at (106,1215) size 0x0
+ RenderText {#text} at (0,1220) size 106x20
+ text run at (0,1220) width 106: "This is some text"
+ RenderBR {BR} at (106,1235) size 0x0
+ RenderText {#text} at (0,1240) size 106x20
+ text run at (0,1240) width 106: "This is some text"
+ RenderBR {BR} at (106,1255) size 0x0
+ RenderText {#text} at (0,1260) size 106x20
+ text run at (0,1260) width 106: "This is some text"
+ RenderBR {BR} at (106,1275) size 0x0
+ RenderText {#text} at (0,1280) size 106x20
+ text run at (0,1280) width 106: "This is some text"
+ RenderBR {BR} at (106,1295) size 0x0
+ RenderText {#text} at (0,1300) size 106x20
+ text run at (0,1300) width 106: "This is some text"
+ RenderBR {BR} at (106,1315) size 0x0
+ RenderText {#text} at (0,1320) size 106x20
+ text run at (0,1320) width 106: "This is some text"
+ RenderBR {BR} at (106,1335) size 0x0
+ RenderText {#text} at (0,1340) size 106x20
+ text run at (0,1340) width 106: "This is some text"
+ RenderBR {BR} at (106,1355) size 0x0
+ RenderText {#text} at (0,1360) size 106x20
+ text run at (0,1360) width 106: "This is some text"
+ RenderBR {BR} at (106,1375) size 0x0
+ RenderText {#text} at (0,1380) size 106x20
+ text run at (0,1380) width 106: "This is some text"
+ RenderBR {BR} at (106,1395) size 0x0
+ RenderText {#text} at (0,1400) size 106x20
+ text run at (0,1400) width 106: "This is some text"
+ RenderBR {BR} at (106,1415) size 0x0
+ RenderText {#text} at (0,1420) size 106x20
+ text run at (0,1420) width 106: "This is some text"
+ RenderBR {BR} at (106,1435) size 0x0
+ RenderText {#text} at (0,1440) size 106x20
+ text run at (0,1440) width 106: "This is some text"
+ RenderBR {BR} at (106,1455) size 0x0
+ RenderText {#text} at (0,1460) size 106x20
+ text run at (0,1460) width 106: "This is some text"
+ RenderBR {BR} at (106,1475) size 0x0
+ RenderText {#text} at (0,1480) size 106x20
+ text run at (0,1480) width 106: "This is some text"
+ RenderBR {BR} at (106,1495) size 0x0
+ RenderText {#text} at (0,1500) size 106x20
+ text run at (0,1500) width 106: "This is some text"
+ RenderBR {BR} at (106,1515) size 0x0
+ RenderText {#text} at (0,1520) size 106x20
+ text run at (0,1520) width 106: "This is some text"
+ RenderBR {BR} at (106,1535) size 0x0
+ RenderText {#text} at (0,1540) size 106x20
+ text run at (0,1540) width 106: "This is some text"
+ RenderBR {BR} at (106,1555) size 0x0
+ RenderText {#text} at (0,1560) size 106x20
+ text run at (0,1560) width 106: "This is some text"
+ RenderBR {BR} at (106,1575) size 0x0
+ RenderText {#text} at (0,1580) size 106x20
+ text run at (0,1580) width 106: "This is some text"
+ RenderBR {BR} at (106,1595) size 0x0
+ RenderText {#text} at (0,1600) size 106x20
+ text run at (0,1600) width 106: "This is some text"
+ RenderBR {BR} at (106,1615) size 0x0
+ RenderText {#text} at (0,1620) size 106x20
+ text run at (0,1620) width 106: "This is some text"
+ RenderBR {BR} at (106,1635) size 0x0
+ RenderText {#text} at (0,1640) size 106x20
+ text run at (0,1640) width 106: "This is some text"
+ RenderBR {BR} at (106,1655) size 0x0
+ RenderText {#text} at (0,1660) size 106x20
+ text run at (0,1660) width 106: "This is some text"
+ RenderBR {BR} at (106,1675) size 0x0
+ RenderText {#text} at (0,1680) size 106x20
+ text run at (0,1680) width 106: "This is some text"
+ RenderBR {BR} at (106,1695) size 0x0
+ RenderText {#text} at (0,1700) size 106x20
+ text run at (0,1700) width 106: "This is some text"
+ RenderBR {BR} at (106,1715) size 0x0
+ RenderText {#text} at (0,1720) size 106x20
+ text run at (0,1720) width 106: "This is some text"
+ RenderBR {BR} at (106,1735) size 0x0
+ RenderText {#text} at (0,1740) size 106x20
+ text run at (0,1740) width 106: "This is some text"
+ RenderBR {BR} at (106,1755) size 0x0
+ RenderText {#text} at (0,1760) size 106x20
+ text run at (0,1760) width 106: "This is some text"
+ RenderBR {BR} at (106,1775) size 0x0
+ RenderText {#text} at (0,1780) size 106x20
+ text run at (0,1780) width 106: "This is some text"
+ RenderBR {BR} at (106,1795) size 0x0
+ RenderText {#text} at (0,1800) size 106x20
+ text run at (0,1800) width 106: "This is some text"
+ RenderBR {BR} at (106,1815) size 0x0
+ RenderText {#text} at (0,1820) size 106x20
+ text run at (0,1820) width 106: "This is some text"
+ RenderBR {BR} at (106,1835) size 0x0
+ RenderText {#text} at (0,1840) size 106x20
+ text run at (0,1840) width 106: "This is some text"
+ RenderBR {BR} at (106,1855) size 0x0
+ RenderText {#text} at (0,1860) size 106x20
+ text run at (0,1860) width 106: "This is some text"
+ RenderBR {BR} at (106,1875) size 0x0
+ RenderText {#text} at (0,1880) size 106x20
+ text run at (0,1880) width 106: "This is some text"
+ RenderBR {BR} at (106,1895) size 0x0
+ RenderText {#text} at (0,1900) size 106x20
+ text run at (0,1900) width 106: "This is some text"
+ RenderBR {BR} at (106,1915) size 0x0
+ RenderText {#text} at (0,1920) size 106x20
+ text run at (0,1920) width 106: "This is some text"
+ RenderBR {BR} at (106,1935) size 0x0
+ RenderText {#text} at (0,1940) size 106x20
+ text run at (0,1940) width 106: "This is some text"
+ RenderBR {BR} at (106,1955) size 0x0
+ RenderText {#text} at (0,1960) size 106x20
+ text run at (0,1960) width 106: "This is some text"
+ RenderBR {BR} at (106,1975) size 0x0
+ RenderText {#text} at (0,1980) size 106x20
+ text run at (0,1980) width 106: "This is some text"
+ RenderBR {BR} at (106,1995) size 0x0
+ RenderText {#text} at (0,2000) size 106x20
+ text run at (0,2000) width 106: "This is some text"
+ RenderBR {BR} at (106,2015) size 0x0
+ RenderText {#text} at (0,2020) size 106x20
+ text run at (0,2020) width 106: "This is some text"
+ RenderBR {BR} at (106,2035) size 0x0
+ RenderText {#text} at (0,2040) size 106x20
+ text run at (0,2040) width 106: "This is some text"
+ RenderBR {BR} at (106,2055) size 0x0
+ RenderText {#text} at (0,2060) size 106x20
+ text run at (0,2060) width 106: "This is some text"
+ RenderBR {BR} at (106,2075) size 0x0
+ RenderText {#text} at (0,2080) size 106x20
+ text run at (0,2080) width 106: "This is some text"
+ RenderBR {BR} at (106,2095) size 0x0
+ RenderText {#text} at (0,2100) size 106x20
+ text run at (0,2100) width 106: "This is some text"
+ RenderBR {BR} at (106,2115) size 0x0
+ RenderText {#text} at (0,2120) size 106x20
+ text run at (0,2120) width 106: "This is some text"
+ RenderBR {BR} at (106,2135) size 0x0
+ RenderText {#text} at (0,2140) size 106x20
+ text run at (0,2140) width 106: "This is some text"
+ RenderBR {BR} at (106,2155) size 0x0
+ RenderText {#text} at (0,2160) size 106x20
+ text run at (0,2160) width 106: "This is some text"
+ RenderBR {BR} at (106,2175) size 0x0
+ RenderText {#text} at (0,2180) size 106x20
+ text run at (0,2180) width 106: "This is some text"
+ RenderBR {BR} at (106,2195) size 0x0
+ RenderText {#text} at (0,2200) size 106x20
+ text run at (0,2200) width 106: "This is some text"
+ RenderBR {BR} at (106,2215) size 0x0
+ RenderText {#text} at (0,2220) size 106x20
+ text run at (0,2220) width 106: "This is some text"
+ RenderBR {BR} at (106,2235) size 0x0
+ RenderText {#text} at (0,2240) size 106x20
+ text run at (0,2240) width 106: "This is some text"
+ RenderBR {BR} at (106,2255) size 0x0
+ RenderText {#text} at (0,2260) size 106x20
+ text run at (0,2260) width 106: "This is some text"
+ RenderBR {BR} at (106,2275) size 0x0
+ RenderText {#text} at (0,2280) size 106x20
+ text run at (0,2280) width 106: "This is some text"
+ RenderBR {BR} at (106,2295) size 0x0
+ RenderText {#text} at (0,2300) size 106x20
+ text run at (0,2300) width 106: "This is some text"
+ RenderBR {BR} at (106,2315) size 0x0
+ RenderText {#text} at (0,2320) size 106x20
+ text run at (0,2320) width 106: "This is some text"
+ RenderBR {BR} at (106,2335) size 0x0
+ RenderText {#text} at (0,2340) size 106x20
+ text run at (0,2340) width 106: "This is some text"
+ RenderBR {BR} at (106,2355) size 0x0
+ RenderText {#text} at (0,2360) size 106x20
+ text run at (0,2360) width 106: "This is some text"
+ RenderBR {BR} at (106,2375) size 0x0
+ RenderText {#text} at (0,2380) size 106x20
+ text run at (0,2380) width 106: "This is some text"
+ RenderBR {BR} at (106,2395) size 0x0
+ RenderText {#text} at (0,2400) size 106x20
+ text run at (0,2400) width 106: "This is some text"
+ RenderBR {BR} at (106,2415) size 0x0
+ RenderText {#text} at (0,2420) size 106x20
+ text run at (0,2420) width 106: "This is some text"
+ RenderBR {BR} at (106,2435) size 0x0
+ RenderText {#text} at (0,2440) size 106x20
+ text run at (0,2440) width 106: "This is some text"
+ RenderBR {BR} at (106,2455) size 0x0
+ RenderText {#text} at (0,2460) size 106x20
+ text run at (0,2460) width 106: "This is some text"
+ RenderBR {BR} at (106,2475) size 0x0
+ RenderText {#text} at (0,2480) size 106x20
+ text run at (0,2480) width 106: "This is some text"
+ RenderBR {BR} at (106,2495) size 0x0
+ RenderText {#text} at (0,2500) size 106x20
+ text run at (0,2500) width 106: "This is some text"
+ RenderBR {BR} at (106,2515) size 0x0
+ RenderText {#text} at (0,2520) size 106x20
+ text run at (0,2520) width 106: "This is some text"
+ RenderBR {BR} at (106,2535) size 0x0
+ RenderText {#text} at (0,2540) size 106x20
+ text run at (0,2540) width 106: "This is some text"
+ RenderBR {BR} at (106,2555) size 0x0
+ RenderText {#text} at (0,2560) size 106x20
+ text run at (0,2560) width 106: "This is some text"
+ RenderBR {BR} at (106,2575) size 0x0
+ RenderText {#text} at (0,2580) size 106x20
+ text run at (0,2580) width 106: "This is some text"
+ RenderBR {BR} at (106,2595) size 0x0
+ RenderText {#text} at (0,2600) size 106x20
+ text run at (0,2600) width 106: "This is some text"
+ RenderBR {BR} at (106,2615) size 0x0
+ RenderText {#text} at (0,2620) size 106x20
+ text run at (0,2620) width 106: "This is some text"
+ RenderBR {BR} at (106,2635) size 0x0
+ RenderText {#text} at (0,2640) size 106x20
+ text run at (0,2640) width 106: "This is some text"
+ RenderBR {BR} at (106,2655) size 0x0
+ RenderText {#text} at (0,2660) size 106x20
+ text run at (0,2660) width 106: "This is some text"
+ RenderBR {BR} at (106,2675) size 0x0
+ RenderText {#text} at (0,2680) size 106x20
+ text run at (0,2680) width 106: "This is some text"
+ RenderBR {BR} at (106,2695) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/shadow-breaking-expected.txt b/LayoutTests/platform/gtk/fast/multicol/shadow-breaking-expected.txt
new file mode 100644
index 0000000..9104883
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/shadow-breaking-expected.txt
@@ -0,0 +1,38 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x8
+ RenderBlock {HTML} at (0,0) size 800x8
+ RenderBody {BODY} at (8,8) size 784x0
+ RenderBlock {DIV} at (0,0) size 784x0
+layer at (20,36) size 424x317
+ RenderBlock (positioned) {P} at (20,36) size 424x317 [border: (2px solid #000000)]
+ RenderBlock (floating) at (2,2) size 24x48
+ RenderText {#text} at (0,0) size 24x48
+ text run at (0,0) width 24: "L"
+ RenderText {#text} at (30,2) size 200x608
+ text run at (30,2) width 172: "orem ipsum dolor sit"
+ text run at (30,24) width 172: "amet, consectetur"
+ text run at (2,46) width 200: "adipiscing elit. Cras pharetra"
+ text run at (2,68) width 200: "mollis pharetra. Suspendisse"
+ text run at (2,90) width 200: "lacinia orci et felis tristique sit"
+ text run at (2,112) width 200: "amet semper massa tempus."
+ text run at (2,134) width 200: "Suspendisse consectetur"
+ text run at (2,156) width 200: "tempor pulvinar. Proin dui"
+ text run at (2,178) width 200: "eros, ultricies vel malesuada"
+ text run at (2,200) width 200: "vel, tempor at ante. Nam eget"
+ text run at (2,222) width 200: "nisl dui. Donec molestie lectus"
+ text run at (2,244) width 200: "a nunc scelerisque blandit."
+ text run at (2,266) width 200: "Nam non ligula massa, sed"
+ text run at (2,324) width 200: "suscipit turpis. Etiam eget"
+ text run at (2,346) width 200: "ligula sit amet turpis"
+ text run at (2,368) width 200: "venenatis dictum in eleifend"
+ text run at (2,390) width 200: "augue. Duis tellus lectus,"
+ text run at (2,412) width 200: "volutpat et adipiscing a,"
+ text run at (2,434) width 200: "pellentesque eu metus."
+ text run at (2,456) width 200: "Aenean suscipit congue"
+ text run at (2,478) width 200: "mauris at gravida. Integer"
+ text run at (2,500) width 200: "lectus ligula, consectetur sit"
+ text run at (2,522) width 200: "amet venenatis id, scelerisque"
+ text run at (2,544) width 200: "eget nisl. Nunc dapibus"
+ text run at (2,566) width 200: "posuere risus, vitae tempor"
+ text run at (2,588) width 97: "nibh iaculis et."
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt
index bde5c68..fd05e30 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-generated-content-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 781x2962
+layer at (0,0) size 781x2988
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x2962
- RenderBlock {HTML} at (0,0) size 781x2962
- RenderBody {BODY} at (8,16) size 765x2930
+layer at (0,0) size 781x2988
+ RenderBlock {HTML} at (0,0) size 781x2988
+ RenderBody {BODY} at (8,16) size 765x2956
layer at (8,16) size 760x461
RenderBlock {DIV} at (0,0) size 760x461 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,44) size 750x33
@@ -111,35 +111,35 @@ layer at (13,929) size 750x20
RenderBlock (generated) at (0,0) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 156x20
text run at (0,0) width 156: "After Generated Content"
-layer at (8,970) size 760x477
- RenderBlock {DIV} at (0,954) size 760x477 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,180) size 750x33
+layer at (8,970) size 760x481
+ RenderBlock {DIV} at (0,954) size 760x481 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,184) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,975) size 750x156
- RenderBlock (anonymous multi-column) at (5,5) size 750x156
+layer at (13,975) size 750x160
+ RenderBlock (anonymous multi-column) at (5,5) size 750x160
RenderBlock (generated) at (0,0) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 166x20
text run at (0,0) width 166: "Before Generated Content"
- RenderBlock {P} at (0,36) size 367x260
- RenderText {#text} at (0,0) size 363x260
+ RenderBlock {P} at (0,36) size 367x264
+ RenderText {#text} at (0,0) size 363x264
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (233,200) width 121: "Lorem ipsum dolor"
- text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,240) width 20: "mi."
-layer at (13,1202) size 750x240
- RenderBlock (anonymous multi-column) at (5,232) size 750x240
+ text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,144) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,164) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,184) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,204) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,204) width 121: "Lorem ipsum dolor"
+ text run at (0,224) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,244) width 20: "mi."
+layer at (13,1206) size 750x240
+ RenderBlock (anonymous multi-column) at (5,236) size 750x240
RenderBlock {P} at (0,0) size 367x440
RenderText {#text} at (0,0) size 363x440
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -168,13 +168,13 @@ layer at (13,1202) size 750x240
RenderBlock (generated) at (0,456) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 156x20
text run at (0,0) width 156: "After Generated Content"
-layer at (8,1463) size 760x477
- RenderBlock {DIV} at (0,1447) size 760x477 [border: (5px solid #800000)]
+layer at (8,1467) size 760x481
+ RenderBlock {DIV} at (0,1451) size 760x481 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,164) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1468) size 750x140
+layer at (13,1472) size 750x140
RenderBlock (anonymous multi-column) at (5,5) size 750x140
RenderBlock (generated) at (0,0) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 166x20
@@ -195,8 +195,8 @@ layer at (13,1468) size 750x140
text run at (233,200) width 121: "Lorem ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 20: "mi."
-layer at (13,1679) size 750x256
- RenderBlock (anonymous multi-column) at (5,216) size 750x256
+layer at (13,1683) size 750x260
+ RenderBlock (anonymous multi-column) at (5,216) size 750x260
RenderBlock (anonymous) at (0,0) size 367x220
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (0,0) size 42x20
@@ -213,29 +213,29 @@ layer at (13,1679) size 750x256
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,236) size 367x220
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock {P} at (0,236) size 367x224
+ RenderText {#text} at (0,0) size 362x224
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
- text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (generated) at (0,472) size 367x20 [bgcolor=#FFFF00]
+ text run at (0,24) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+ text run at (0,44) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+ text run at (0,64) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+ text run at (0,84) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,104) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,144) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,164) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,184) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,204) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock (generated) at (0,476) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 156x20
text run at (0,0) width 156: "After Generated Content"
-layer at (8,1956) size 760x477
- RenderBlock {DIV} at (0,1940) size 760x477 [border: (5px solid #800000)]
+layer at (8,1964) size 760x481
+ RenderBlock {DIV} at (0,1948) size 760x481 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,284) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1961) size 750x260
+layer at (13,1969) size 750x260
RenderBlock (anonymous multi-column) at (5,5) size 750x260
RenderBlock (generated) at (0,0) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 166x20
@@ -275,8 +275,8 @@ layer at (13,1961) size 750x260
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (13,2292) size 750x136
- RenderBlock (anonymous multi-column) at (5,336) size 750x136
+layer at (13,2300) size 750x140
+ RenderBlock (anonymous multi-column) at (5,336) size 750x140
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -293,14 +293,14 @@ layer at (13,2292) size 750x136
RenderBlock (generated) at (0,236) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 156x20
text run at (0,0) width 156: "After Generated Content"
-layer at (8,2449) size 760x497
- RenderBlock {DIV} at (0,2433) size 760x497 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,300) size 750x33
+layer at (8,2461) size 760x511
+ RenderBlock {DIV} at (0,2445) size 760x511 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,314) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,2454) size 750x276
- RenderBlock (anonymous multi-column) at (5,5) size 750x276
+layer at (13,2466) size 750x290
+ RenderBlock (anonymous multi-column) at (5,5) size 750x290
RenderBlock (generated) at (0,0) size 367x20 [bgcolor=#FFFF00]
RenderText at (0,0) size 166x20
text run at (0,0) width 166: "Before Generated Content"
@@ -317,11 +317,11 @@ layer at (13,2454) size 750x276
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,272) size 367x40
+ RenderBlock {P} at (0,290) size 367x40
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderBlock {P} at (0,328) size 367x220
+ RenderBlock {P} at (0,346) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -334,8 +334,8 @@ layer at (13,2454) size 750x276
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (13,2801) size 750x140
- RenderBlock (anonymous multi-column) at (5,352) size 750x140
+layer at (13,2827) size 750x140
+ RenderBlock (anonymous multi-column) at (5,366) size 750x140
RenderBlock (anonymous) at (0,0) size 367x20
RenderInline {SPAN} at (0,0) size 354x20
RenderText {#text} at (0,0) size 354x20
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
index 0877f42..2a33c86 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
@@ -1,20 +1,20 @@
-layer at (0,0) size 781x2626
+layer at (0,0) size 781x2625
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x2626
- RenderBlock {HTML} at (0,0) size 781x2626
- RenderBody {BODY} at (8,8) size 765x2602
+layer at (0,0) size 781x2625
+ RenderBlock {HTML} at (0,0) size 781x2625
+ RenderBody {BODY} at (8,8) size 765x2601
RenderBlock (anonymous) at (0,0) size 765x40
RenderText {#text} at (0,0) size 760x40
text run at (0,0) width 760: "In this test, all of the spanning elements have their spans turned off dynamically, and so they should just be in the column"
text run at (0,20) width 33: "flow."
RenderText {#text} at (0,0) size 0x0
-layer at (8,64) size 760x390
- RenderBlock {DIV} at (0,56) size 760x390 [border: (5px solid #800000)]
- RenderBlock {H2} at (5,24) size 367x33 [bgcolor=#EEEEEE]
+layer at (8,64) size 760x387
+ RenderBlock {DIV} at (0,56) size 760x387 [border: (5px solid #800000)]
+ RenderBlock {H2} at (5,5) size 367x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,76) size 367x680
- RenderText {#text} at (0,0) size 363x680
+ RenderBlock (anonymous) at (5,57) size 367x685
+ RenderText {#text} at (0,0) size 363x685
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -32,29 +32,29 @@ layer at (8,64) size 760x390
text run at (0,260) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
text run at (0,280) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
text run at (0,300) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (0,320) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,340) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,360) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,420) width 95: "adipiscing elit. "
- text run at (95,420) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,440) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
- text run at (0,460) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
- text run at (0,480) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
- text run at (0,500) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,520) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
- text run at (0,540) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
- text run at (0,560) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
- text run at (0,580) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
- text run at (0,600) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
- text run at (0,620) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,640) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,660) width 154: "Nulla varius enim ac mi."
-layer at (8,470) size 760x390
- RenderBlock {DIV} at (0,462) size 760x390 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x680
- RenderText {#text} at (0,0) size 363x680
+ text run at (0,325) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,345) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,365) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,385) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,405) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,425) width 95: "adipiscing elit. "
+ text run at (95,425) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,445) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
+ text run at (0,465) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
+ text run at (0,485) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
+ text run at (0,505) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,525) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (0,545) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
+ text run at (0,565) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
+ text run at (0,585) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
+ text run at (0,605) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
+ text run at (0,625) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,645) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,665) width 154: "Nulla varius enim ac mi."
+layer at (8,467) size 760x402
+ RenderBlock {DIV} at (0,459) size 760x402 [border: (5px solid #800000)]
+ RenderBlock (anonymous) at (5,5) size 367x692
+ RenderText {#text} at (0,0) size 363x692
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -75,28 +75,28 @@ layer at (8,470) size 760x390
text run at (0,320) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
text run at (0,340) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
text run at (0,360) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,420) width 95: "adipiscing elit. "
- text run at (95,420) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,440) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
- text run at (0,460) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
- text run at (0,480) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
- text run at (0,500) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,520) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
- text run at (0,540) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
- text run at (0,560) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
- text run at (0,580) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
- text run at (0,600) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
- text run at (0,620) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,640) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,660) width 154: "Nulla varius enim ac mi."
- RenderBlock {H2} at (5,704) size 367x33 [bgcolor=#EEEEEE]
+ text run at (0,392) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,412) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,432) width 95: "adipiscing elit. "
+ text run at (95,432) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,452) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
+ text run at (0,472) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
+ text run at (0,492) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
+ text run at (0,512) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,532) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (0,552) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
+ text run at (0,572) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
+ text run at (0,592) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
+ text run at (0,612) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
+ text run at (0,632) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,652) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,672) width 154: "Nulla varius enim ac mi."
+ RenderBlock {H2} at (5,716) size 367x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (8,876) size 760x417
- RenderBlock {DIV} at (0,868) size 760x417 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x260
+layer at (8,885) size 760x413
+ RenderBlock {DIV} at (0,877) size 760x413 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x260
RenderText {#text} at (0,0) size 363x260
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -112,36 +112,36 @@ layer at (8,876) size 760x417
text run at (233,200) width 121: "Lorem ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 20: "mi."
- RenderBlock {H2} at (5,300) size 367x33 [bgcolor=#EEEEEE]
+ RenderBlock {H2} at (5,284) size 367x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock {P} at (5,352) size 367x440
- RenderText {#text} at (0,0) size 363x440
+ RenderBlock {P} at (5,336) size 367x452
+ RenderText {#text} at (0,0) size 363x452
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (233,200) width 121: "Lorem ipsum dolor"
- text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,240) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,260) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (0,280) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,300) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (0,320) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,340) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,360) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,420) width 91: "adipiscing elit."
-layer at (8,1309) size 760x421
- RenderBlock {DIV} at (0,1301) size 760x421 [border: (5px solid #800000)]
+ text run at (0,72) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+ text run at (0,92) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,112) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,132) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,152) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,172) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,192) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,212) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,212) width 121: "Lorem ipsum dolor"
+ text run at (0,232) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,252) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,272) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,292) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,312) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,332) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,352) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,372) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,392) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,412) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,432) width 91: "adipiscing elit."
+layer at (8,1314) size 760x423
+ RenderBlock {DIV} at (0,1306) size 760x423 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x260
RenderText {#text} at (0,0) size 363x260
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -161,23 +161,23 @@ layer at (8,1309) size 760x421
RenderBlock {H2} at (5,284) size 367x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,336) size 367x220
+ RenderBlock (anonymous) at (5,336) size 367x222
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (0,0) size 42x20
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x220
+ RenderText {#text} at (42,0) size 362x222
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,572) size 367x220
+ text run at (0,82) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,102) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,122) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,142) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,162) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,182) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,202) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (5,574) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -190,8 +190,8 @@ layer at (8,1309) size 760x421
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1746) size 760x410
- RenderBlock {DIV} at (0,1738) size 760x410 [border: (5px solid #800000)]
+layer at (8,1753) size 760x413
+ RenderBlock {DIV} at (0,1745) size 760x413 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x220
RenderInline {SPAN} at (0,0) size 362x220
RenderText {#text} at (0,0) size 362x220
@@ -211,11 +211,11 @@ layer at (8,1746) size 760x410
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,265) size 367x220
+ RenderBlock (anonymous) at (5,265) size 367x223
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (0,0) size 42x20
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x220
+ RenderText {#text} at (42,0) size 362x223
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -223,14 +223,14 @@ layer at (8,1746) size 760x410
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {H2} at (5,504) size 367x33 [bgcolor=#EEEEEE]
+ text run at (0,143) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,163) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,183) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,203) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {H2} at (5,507) size 367x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock {P} at (5,556) size 367x220
+ RenderBlock {P} at (5,559) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -243,9 +243,9 @@ layer at (8,1746) size 760x410
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,2172) size 760x438
- RenderBlock {DIV} at (0,2164) size 760x438 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x220
+layer at (8,2182) size 760x427
+ RenderBlock {DIV} at (0,2174) size 760x427 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -258,35 +258,35 @@ layer at (8,2172) size 760x438
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,257) size 367x40
+ RenderBlock {P} at (5,241) size 367x40
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderBlock {P} at (5,313) size 367x220
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock {P} at (5,297) size 367x225
+ RenderText {#text} at (0,0) size 362x225
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {H2} at (5,552) size 367x33 [bgcolor=#EEEEEE]
+ text run at (0,125) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,145) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,165) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,185) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,205) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {H2} at (5,541) size 367x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,604) size 367x20
+ RenderBlock (anonymous) at (5,593) size 367x20
RenderInline {SPAN} at (0,0) size 354x20
RenderText {#text} at (0,0) size 354x20
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,624) size 367x20
+ RenderBlock (anonymous) at (5,613) size 367x20
RenderBlock {SPAN} at (0,0) size 367x20
RenderText {#text} at (0,0) size 154x20
text run at (0,0) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,644) size 367x200
+ RenderBlock (anonymous) at (5,633) size 367x200
RenderInline {SPAN} at (0,0) size 362x200
RenderText {#text} at (0,0) size 362x200
text run at (0,0) width 362: "Curabitur sollicitudin felis quis lectus. Quisque adipiscing"
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
index e9cb2ee..8bcf6ab 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-dynamic-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 781x2830
+layer at (0,0) size 781x2818
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x2830
- RenderBlock {HTML} at (0,0) size 781x2830
- RenderBody {BODY} at (8,16) size 765x2798
+layer at (0,0) size 781x2818
+ RenderBlock {HTML} at (0,0) size 781x2818
+ RenderBody {BODY} at (8,16) size 765x2786
layer at (8,16) size 760x421
RenderBlock {DIV} at (0,0) size 760x421 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x33
@@ -144,8 +144,8 @@ layer at (13,1122) size 750x220
text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
text run at (0,420) width 91: "adipiscing elit."
-layer at (8,1379) size 760x473
- RenderBlock {DIV} at (0,1363) size 760x473 [border: (5px solid #800000)]
+layer at (8,1379) size 760x457
+ RenderBlock {DIV} at (0,1363) size 760x457 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,164) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
@@ -168,8 +168,8 @@ layer at (13,1384) size 750x140
text run at (233,200) width 121: "Lorem ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 20: "mi."
-layer at (13,1595) size 750x236
- RenderBlock (anonymous multi-column) at (5,216) size 750x236
+layer at (13,1595) size 750x220
+ RenderBlock (anonymous multi-column) at (5,216) size 750x220
RenderBlock (anonymous) at (0,0) size 367x220
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (0,0) size 42x20
@@ -186,7 +186,7 @@ layer at (13,1595) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,236) size 367x220
+ RenderBlock {P} at (0,220) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -199,13 +199,13 @@ layer at (13,1595) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1868) size 760x457
- RenderBlock {DIV} at (0,1852) size 760x457 [border: (5px solid #800000)]
+layer at (8,1852) size 760x457
+ RenderBlock {DIV} at (0,1836) size 760x457 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,264) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,1873) size 750x240
+layer at (13,1857) size 750x240
RenderBlock (anonymous multi-column) at (5,5) size 750x240
RenderBlock (anonymous) at (0,0) size 367x220
RenderInline {SPAN} at (0,0) size 362x220
@@ -242,7 +242,7 @@ layer at (13,1873) size 750x240
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (13,2184) size 750x120
+layer at (13,2168) size 750x120
RenderBlock (anonymous multi-column) at (5,316) size 750x120
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
@@ -257,14 +257,14 @@ layer at (13,2184) size 750x120
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,2341) size 760x473
- RenderBlock {DIV} at (0,2325) size 760x473 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,296) size 750x33
+layer at (8,2325) size 760x477
+ RenderBlock {DIV} at (0,2309) size 760x477 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,300) size 750x33
RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,2362) size 750x256
- RenderBlock (anonymous multi-column) at (5,21) size 750x256
+layer at (13,2346) size 750x260
+ RenderBlock (anonymous multi-column) at (5,21) size 750x260
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -278,11 +278,11 @@ layer at (13,2362) size 750x256
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,236) size 367x40
- RenderText {#text} at (0,0) size 354x40
+ RenderBlock {P} at (0,236) size 367x44
+ RenderText {#text} at (0,0) size 354x44
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderBlock {P} at (0,292) size 367x220
+ text run at (0,24) width 154: "Nulla varius enim ac mi."
+ RenderBlock {P} at (0,296) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -295,8 +295,8 @@ layer at (13,2362) size 750x256
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (13,2689) size 750x120
- RenderBlock (anonymous multi-column) at (5,348) size 750x120
+layer at (13,2677) size 750x120
+ RenderBlock (anonymous multi-column) at (5,352) size 750x120
RenderBlock (anonymous) at (0,0) size 367x20
RenderInline {SPAN} at (0,0) size 354x20
RenderText {#text} at (0,0) size 354x20
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-expected.txt
index 88ae204..b1b8190 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 781x3737
+layer at (0,0) size 781x3732
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x3737
- RenderBlock {HTML} at (0,0) size 781x3737
- RenderBody {BODY} at (8,16) size 765x3705
+layer at (0,0) size 781x3732
+ RenderBlock {HTML} at (0,0) size 781x3732
+ RenderBody {BODY} at (8,16) size 765x3700
layer at (8,16) size 760x421
RenderBlock {DIV} at (0,0) size 760x421 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x33
@@ -142,8 +142,8 @@ layer at (13,1106) size 750x220
text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
text run at (0,420) width 91: "adipiscing elit."
-layer at (8,1347) size 760x409
- RenderBlock {DIV} at (0,1331) size 760x409 [border: (5px solid #800000)]
+layer at (8,1347) size 760x410
+ RenderBlock {DIV} at (0,1331) size 760x410 [border: (5px solid #800000)]
RenderText {#text} at (5,5) size 363x269
text run at (5,5) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (5,25) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -164,33 +164,33 @@ layer at (8,1347) size 760x409
text run at (29,245) width 321: "This is a spanning element with"
text run at (5,278) width 345: "an original display of inline in the"
text run at (5,311) width 294: "middle of the columns block."
- RenderText {#text} at (299,320) size 363x464
+ RenderText {#text} at (299,320) size 363x465
text run at (299,320) width 46: " Lorem"
text run at (5,344) width 347: "ipsum dolor sit amet, consectetuer adipiscing elit. Nulla"
text run at (5,364) width 356: "varius enim ac mi. Curabitur sollicitudin felis quis lectus."
text run at (5,384) width 324: "Quisque adipiscing rhoncus sem. Proin nulla purus,"
- text run at (5,404) width 345: "vulputate vel, varius ut, euismod et, nisi. Sed vitae felis"
- text run at (5,424) width 346: "vel orci sagittis aliquam. Cras convallis adipiscing sem."
- text run at (5,444) width 353: "Nam nonummy enim. Nullam bibendum lobortis neque."
- text run at (5,464) width 332: "Vestibulum velit orci, tempus euismod, pretium quis,"
- text run at (5,484) width 309: "interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,504) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (5,524) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (5,544) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (238,544) width 121: "Lorem ipsum dolor"
- text run at (5,564) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (5,584) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (5,604) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (5,624) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (5,644) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (5,664) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,684) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (5,704) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (5,724) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (5,744) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (5,764) width 91: "adipiscing elit."
-layer at (8,1772) size 760x427
- RenderBlock {DIV} at (0,1756) size 760x427 [border: (5px solid #800000)]
+ text run at (5,405) width 345: "vulputate vel, varius ut, euismod et, nisi. Sed vitae felis"
+ text run at (5,425) width 346: "vel orci sagittis aliquam. Cras convallis adipiscing sem."
+ text run at (5,445) width 353: "Nam nonummy enim. Nullam bibendum lobortis neque."
+ text run at (5,465) width 332: "Vestibulum velit orci, tempus euismod, pretium quis,"
+ text run at (5,485) width 309: "interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (5,505) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (5,525) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (5,545) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (238,545) width 121: "Lorem ipsum dolor"
+ text run at (5,565) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (5,585) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (5,605) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (5,625) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (5,645) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (5,665) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (5,685) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (5,705) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (5,725) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (5,745) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (5,765) width 91: "adipiscing elit."
+layer at (8,1773) size 760x429
+ RenderBlock {DIV} at (0,1757) size 760x429 [border: (5px solid #800000)]
RenderText {#text} at (5,5) size 363x260
text run at (5,5) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (5,25) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -211,39 +211,39 @@ layer at (8,1772) size 760x427
text run at (0,0) width 324: "This element specifies a column"
text run at (0,33) width 338: "span, but it is also floating, so the"
text run at (0,66) width 325: "column-span should be ignored."
- RenderText {#text} at (29,245) size 363x577
+ RenderText {#text} at (29,245) size 363x579
text run at (29,245) width 327: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
text run at (5,402) width 348: "elit. Nulla varius enim ac mi. Curabitur sollicitudin felis"
- text run at (5,422) width 355: "quis lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (5,442) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (5,462) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (5,482) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (5,502) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (5,522) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,542) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (5,562) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (5,582) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (238,582) width 121: "Lorem ipsum dolor"
- text run at (5,602) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (5,622) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (5,642) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (5,662) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (5,682) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (5,702) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,722) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (5,742) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (5,762) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (5,782) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (5,802) width 91: "adipiscing elit."
-layer at (8,2215) size 760x486
- RenderBlock {DIV} at (0,2199) size 760x486 [border: (5px solid #800000)]
+ text run at (5,424) width 355: "quis lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+ text run at (5,444) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+ text run at (5,464) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (5,484) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (5,504) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (5,524) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (5,544) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (5,564) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (5,584) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (238,584) width 121: "Lorem ipsum dolor"
+ text run at (5,604) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (5,624) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (5,644) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (5,664) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (5,684) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (5,704) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (5,724) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (5,744) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (5,764) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (5,784) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (5,804) width 91: "adipiscing elit."
+layer at (8,2218) size 760x490
+ RenderBlock {DIV} at (0,2202) size 760x490 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x66
RenderBlock {H2} at (0,0) size 750x66 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 709x66
text run at (0,0) width 709: "This is a spanning element at the beginning of the columns block with"
text run at (0,33) width 145: "block siblings."
-layer at (13,2324) size 750x356
- RenderBlock (anonymous multi-column) at (5,109) size 750x356
+layer at (13,2327) size 750x360
+ RenderBlock (anonymous multi-column) at (5,109) size 750x360
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -257,20 +257,20 @@ layer at (13,2324) size 750x356
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,236) size 367x220
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock {P} at (0,236) size 367x224
+ RenderText {#text} at (0,0) size 362x224
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,472) size 367x220
+ text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,144) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,164) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,184) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,204) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (0,476) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -283,15 +283,15 @@ layer at (13,2324) size 750x356
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,2717) size 760x486
- RenderBlock {DIV} at (0,2701) size 760x486 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,396) size 750x66
+layer at (8,2724) size 760x490
+ RenderBlock {DIV} at (0,2708) size 760x490 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,400) size 750x66
RenderBlock {H2} at (0,0) size 750x66 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 707x66
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,33) width 83: "siblings."
-layer at (13,2738) size 750x356
- RenderBlock (anonymous multi-column) at (5,21) size 750x356
+layer at (13,2745) size 750x360
+ RenderBlock (anonymous multi-column) at (5,21) size 750x360
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -305,20 +305,20 @@ layer at (13,2738) size 750x356
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,236) size 367x220
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock {P} at (0,236) size 367x224
+ RenderText {#text} at (0,0) size 362x224
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,472) size 367x220
+ text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,144) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,164) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,184) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,204) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (0,476) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -331,15 +331,15 @@ layer at (13,2738) size 750x356
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,3219) size 760x502
- RenderBlock {DIV} at (0,3203) size 760x502 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,276) size 750x66
+layer at (8,3230) size 760x486
+ RenderBlock {DIV} at (0,3214) size 760x486 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,260) size 750x66
RenderBlock {H2} at (0,0) size 750x66 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 741x66
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,33) width 83: "siblings."
-layer at (13,3240) size 750x236
- RenderBlock (anonymous multi-column) at (5,21) size 750x236
+layer at (13,3251) size 750x220
+ RenderBlock (anonymous multi-column) at (5,21) size 750x220
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -353,7 +353,7 @@ layer at (13,3240) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,236) size 367x220
+ RenderBlock {P} at (0,220) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -366,8 +366,8 @@ layer at (13,3240) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (13,3580) size 750x120
- RenderBlock (anonymous multi-column) at (5,361) size 750x120
+layer at (13,3575) size 750x120
+ RenderBlock (anonymous multi-column) at (5,345) size 750x120
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
index 86d2e5c..81c0207 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 781x2368
+layer at (0,0) size 781x2380
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x2368
- RenderBlock {HTML} at (0,0) size 781x2368
- RenderBody {BODY} at (8,16) size 765x2336
+layer at (0,0) size 781x2380
+ RenderBlock {HTML} at (0,0) size 781x2380
+ RenderBody {BODY} at (8,16) size 765x2348
layer at (8,16) size 760x350
RenderBlock {DIV} at (0,0) size 760x350 [border: (5px solid #800000)]
RenderText {#text} at (5,5) size 363x680
@@ -83,7 +83,7 @@ layer at (8,382) size 760x350
text run at (5,665) width 154: "Nulla varius enim ac mi."
layer at (8,748) size 760x386
RenderBlock {DIV} at (0,732) size 760x386 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x260
+ RenderBlock {P} at (5,5) size 367x260
RenderText {#text} at (0,0) size 363x260
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -99,7 +99,7 @@ layer at (8,748) size 760x386
text run at (233,200) width 121: "Lorem ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 20: "mi."
- RenderBlock {P} at (5,297) size 367x440
+ RenderBlock {P} at (5,281) size 367x440
RenderText {#text} at (0,0) size 363x440
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -124,8 +124,8 @@ layer at (8,748) size 760x386
text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
text run at (0,420) width 91: "adipiscing elit."
-layer at (8,1150) size 760x382
- RenderBlock {DIV} at (0,1134) size 760x382 [border: (5px solid #800000)]
+layer at (8,1150) size 760x386
+ RenderBlock {DIV} at (0,1134) size 760x386 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x260
RenderText {#text} at (0,0) size 363x260
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -142,23 +142,23 @@ layer at (8,1150) size 760x382
text run at (233,200) width 121: "Lorem ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 20: "mi."
- RenderBlock (anonymous) at (5,265) size 367x220
+ RenderBlock (anonymous) at (5,265) size 367x236
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (0,0) size 42x20
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x220
+ RenderText {#text} at (42,0) size 362x236
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,501) size 367x220
+ text run at (0,116) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,136) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,156) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,176) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,196) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,216) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (5,517) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -171,8 +171,8 @@ layer at (8,1150) size 760x382
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1548) size 760x382
- RenderBlock {DIV} at (0,1532) size 760x382 [border: (5px solid #800000)]
+layer at (8,1552) size 760x386
+ RenderBlock {DIV} at (0,1536) size 760x386 [border: (5px solid #800000)]
RenderBlock (anonymous) at (5,5) size 367x220
RenderInline {SPAN} at (0,0) size 362x220
RenderText {#text} at (0,0) size 362x220
@@ -192,23 +192,23 @@ layer at (8,1548) size 760x382
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,265) size 367x220
+ RenderBlock (anonymous) at (5,265) size 367x236
RenderInline {SPAN} at (0,0) size 42x20
RenderText {#text} at (0,0) size 42x20
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x220
+ RenderText {#text} at (42,0) size 362x236
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,501) size 367x220
+ text run at (0,116) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,136) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,156) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,176) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,196) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,216) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (5,517) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -221,9 +221,9 @@ layer at (8,1548) size 760x382
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1946) size 760x406
- RenderBlock {DIV} at (0,1930) size 760x406 [border: (5px solid #800000)]
- RenderBlock {P} at (5,21) size 367x220
+layer at (8,1954) size 760x410
+ RenderBlock {DIV} at (0,1938) size 760x410 [border: (5px solid #800000)]
+ RenderBlock {P} at (5,5) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -236,32 +236,32 @@ layer at (8,1946) size 760x406
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,257) size 367x40
+ RenderBlock {P} at (5,241) size 367x40
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
- RenderBlock {P} at (5,313) size 367x220
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock {P} at (5,297) size 367x228
+ RenderText {#text} at (0,0) size 362x228
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,549) size 367x20
+ text run at (0,108) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,128) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,148) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,168) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,188) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,208) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock (anonymous) at (5,541) size 367x20
RenderInline {SPAN} at (0,0) size 354x20
RenderText {#text} at (0,0) size 354x20
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,569) size 367x20
+ RenderBlock (anonymous) at (5,561) size 367x20
RenderBlock {SPAN} at (0,0) size 367x20
RenderText {#text} at (0,0) size 154x20
text run at (0,0) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,589) size 367x200
+ RenderBlock (anonymous) at (5,581) size 367x200
RenderInline {SPAN} at (0,0) size 362x200
RenderText {#text} at (0,0) size 362x200
text run at (0,0) width 362: "Curabitur sollicitudin felis quis lectus. Quisque adipiscing"
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
index 5737a68..26786f0 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-dynamic-expected.txt
@@ -1,16 +1,16 @@
-layer at (0,0) size 781x1427
+layer at (0,0) size 781x1451
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x1427
- RenderBlock {HTML} at (0,0) size 781x1427
- RenderBody {BODY} at (8,16) size 765x1395
-layer at (8,16) size 760x437
- RenderBlock {DIV} at (0,0) size 760x437 [border: (5px solid #800000)]
+layer at (0,0) size 781x1451
+ RenderBlock {HTML} at (0,0) size 781x1451
+ RenderBody {BODY} at (8,16) size 765x1419
+layer at (8,16) size 760x441
+ RenderBlock {DIV} at (0,0) size 760x441 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x33 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,92) size 750x356
- RenderBlock (anonymous multi-column) at (5,76) size 750x356
+layer at (13,92) size 750x360
+ RenderBlock (anonymous multi-column) at (5,76) size 750x360
RenderBlock {SPAN} at (0,0) size 367x220 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -24,45 +24,45 @@ layer at (13,92) size 750x356
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,236) size 367x460
- RenderText {#text} at (0,0) size 362x220
+ RenderBlock (anonymous) at (0,236) size 367x464
+ RenderText {#text} at (0,0) size 362x224
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,144) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,164) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,184) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,204) width 233: "sit amet, consectetuer adipiscing elit. "
RenderInline {SPAN} at (0,0) size 42x20
- RenderText {#text} at (233,200) size 42x20
- text run at (233,200) width 42: "Lorem"
- RenderText {#text} at (275,200) size 363x260
- text run at (275,200) width 79: " ipsum dolor"
- text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,240) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,260) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (0,280) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,300) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (0,320) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,340) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,360) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,420) width 95: "adipiscing elit. "
- text run at (95,420) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,440) width 249: "adipiscing elit. Nulla varius enim ac mi."
-layer at (8,469) size 760x437
- RenderBlock {DIV} at (0,453) size 760x437 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,380) size 750x33 [color=#FFFFFF]
+ RenderText {#text} at (233,204) size 42x20
+ text run at (233,204) width 42: "Lorem"
+ RenderText {#text} at (275,204) size 363x260
+ text run at (275,204) width 79: " ipsum dolor"
+ text run at (0,224) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,244) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,264) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,284) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,304) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,324) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,344) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,364) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,384) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,404) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,424) width 95: "adipiscing elit. "
+ text run at (95,424) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,444) width 249: "adipiscing elit. Nulla varius enim ac mi."
+layer at (8,473) size 760x441
+ RenderBlock {DIV} at (0,457) size 760x441 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,384) size 750x33 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,474) size 750x356
- RenderBlock (anonymous multi-column) at (5,5) size 750x356
+layer at (13,478) size 750x360
+ RenderBlock (anonymous multi-column) at (5,5) size 750x360
RenderBlock (anonymous) at (0,0) size 367x640
RenderText {#text} at (0,0) size 363x640
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -103,16 +103,16 @@ layer at (13,474) size 750x356
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
-layer at (8,922) size 760x489
- RenderBlock {DIV} at (0,906) size 760x489 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,180) size 750x33 [color=#FFFFFF]
+layer at (8,930) size 760x505
+ RenderBlock {DIV} at (0,914) size 760x505 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,190) size 750x33 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x33
text run at (0,0) width 276: "This is a spanning element."
-layer at (13,943) size 750x140
- RenderBlock (anonymous multi-column) at (5,21) size 750x140
- RenderBlock {P} at (0,0) size 367x220
- RenderText {#text} at (0,0) size 362x220
+layer at (13,951) size 750x150
+ RenderBlock (anonymous multi-column) at (5,21) size 750x150
+ RenderBlock {P} at (0,0) size 367x230
+ RenderText {#text} at (0,0) size 362x230
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -120,17 +120,17 @@ layer at (13,943) size 750x140
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {SPAN} at (0,236) size 367x40 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,150) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,170) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,190) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,210) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {SPAN} at (0,246) size 367x40 [color=#FFFFFF] [bgcolor=#000000]
RenderBlock (anonymous) at (0,0) size 367x40
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
-layer at (13,1154) size 750x236
- RenderBlock (anonymous multi-column) at (5,232) size 750x236
+layer at (13,1172) size 750x242
+ RenderBlock (anonymous multi-column) at (5,242) size 750x242
RenderBlock {SPAN} at (0,0) size 367x220 [color=#FFFFFF] [bgcolor=#000000]
RenderBlock {P} at (0,0) size 367x220
RenderText {#text} at (0,0) size 362x220
@@ -145,7 +145,7 @@ layer at (13,1154) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,236) size 367x220
+ RenderBlock (anonymous) at (0,242) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -158,4 +158,4 @@ layer at (13,1154) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,472) size 367x0
+ RenderBlock {P} at (0,478) size 367x0
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt
index b79aaa1..ce50e8c 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt
@@ -1,16 +1,16 @@
-layer at (0,0) size 781x1399
+layer at (0,0) size 781x1407
RenderView at (0,0) size 781x600
-layer at (0,0) size 781x1399
- RenderBlock {HTML} at (0,0) size 781x1399
- RenderBody {BODY} at (8,16) size 765x1367
-layer at (8,16) size 760x437
- RenderBlock {DIV} at (0,0) size 760x437 [border: (5px solid #800000)]
+layer at (0,0) size 781x1407
+ RenderBlock {HTML} at (0,0) size 781x1407
+ RenderBody {BODY} at (8,16) size 765x1375
+layer at (8,16) size 760x441
+ RenderBlock {DIV} at (0,0) size 760x441 [border: (5px solid #800000)]
RenderBlock (anonymous multi-column span) at (5,24) size 750x33 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 664x33
text run at (0,0) width 664: "This is a spanning element at the beginning of the columns block."
-layer at (13,92) size 750x356
- RenderBlock (anonymous multi-column) at (5,76) size 750x356
+layer at (13,92) size 750x360
+ RenderBlock (anonymous multi-column) at (5,76) size 750x360
RenderBlock {SPAN} at (0,0) size 367x220 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -24,43 +24,43 @@ layer at (13,92) size 750x356
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,236) size 367x460
- RenderText {#text} at (0,0) size 363x460
+ RenderBlock (anonymous) at (0,236) size 367x464
+ RenderText {#text} at (0,0) size 363x464
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,60) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (233,200) width 121: "Lorem ipsum dolor"
- text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,240) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,260) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (0,280) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,300) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (0,320) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,340) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,360) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,420) width 95: "adipiscing elit. "
- text run at (95,420) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,440) width 249: "adipiscing elit. Nulla varius enim ac mi."
-layer at (8,469) size 760x441
- RenderBlock {DIV} at (0,453) size 760x441 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,384) size 750x33 [color=#FFFFFF]
+ text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,144) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,164) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,184) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,204) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,204) width 121: "Lorem ipsum dolor"
+ text run at (0,224) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,244) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,264) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,284) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,304) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,324) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,344) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,364) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,384) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,404) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,424) width 95: "adipiscing elit. "
+ text run at (95,424) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,444) width 249: "adipiscing elit. Nulla varius enim ac mi."
+layer at (8,473) size 760x451
+ RenderBlock {DIV} at (0,457) size 760x451 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,394) size 750x33 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 600x33
text run at (0,0) width 600: "This is a spanning element at the end of the columns block."
-layer at (13,474) size 750x360
- RenderBlock (anonymous multi-column) at (5,5) size 750x360
- RenderBlock (anonymous) at (0,0) size 367x440
- RenderText {#text} at (0,0) size 363x440
+layer at (13,478) size 750x370
+ RenderBlock (anonymous multi-column) at (5,5) size 750x370
+ RenderBlock (anonymous) at (0,0) size 367x450
+ RenderText {#text} at (0,0) size 363x450
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -80,11 +80,11 @@ layer at (13,474) size 750x360
text run at (0,300) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
text run at (0,320) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
text run at (0,340) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,360) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,380) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,400) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,420) width 91: "adipiscing elit."
- RenderBlock {SPAN} at (0,456) size 367x260 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,370) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,390) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,410) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,430) width 91: "adipiscing elit."
+ RenderBlock {SPAN} at (0,466) size 367x260 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 363x260
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -100,16 +100,16 @@ layer at (13,474) size 750x360
text run at (233,200) width 121: "Lorem ipsum dolor"
text run at (0,220) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,240) width 20: "mi."
-layer at (8,926) size 760x457
- RenderBlock {DIV} at (0,910) size 760x457 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,164) size 750x33 [color=#FFFFFF]
+layer at (8,940) size 760x451
+ RenderBlock {DIV} at (0,924) size 760x451 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,174) size 750x33 [color=#FFFFFF]
RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 634x33
text run at (0,0) width 634: "This is a spanning element in the middle of the columns block."
-layer at (13,931) size 750x140
- RenderBlock (anonymous multi-column) at (5,5) size 750x140
- RenderBlock (anonymous) at (0,0) size 367x220
- RenderText {#text} at (0,0) size 362x220
+layer at (13,945) size 750x150
+ RenderBlock (anonymous multi-column) at (5,5) size 750x150
+ RenderBlock (anonymous) at (0,0) size 367x230
+ RenderText {#text} at (0,0) size 362x230
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,40) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -117,16 +117,16 @@ layer at (13,931) size 750x140
text run at (0,80) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,100) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,140) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {SPAN} at (0,236) size 367x40 [color=#FFFFFF] [bgcolor=#000000]
+ text run at (0,150) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,170) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,190) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,210) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {SPAN} at (0,246) size 367x40 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 354x40
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 154: "Nulla varius enim ac mi."
-layer at (13,1142) size 750x236
- RenderBlock (anonymous multi-column) at (5,216) size 750x236
+layer at (13,1166) size 750x220
+ RenderBlock (anonymous multi-column) at (5,226) size 750x220
RenderBlock {SPAN} at (0,0) size 367x220 [color=#FFFFFF] [bgcolor=#000000]
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -140,7 +140,7 @@ layer at (13,1142) size 750x236
text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,180) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,200) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (0,236) size 367x220
+ RenderBlock (anonymous) at (0,220) size 367x220
RenderText {#text} at (0,0) size 362x220
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,20) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
diff --git a/LayoutTests/platform/gtk/fast/multicol/table-margin-collapse-expected.txt b/LayoutTests/platform/gtk/fast/multicol/table-margin-collapse-expected.txt
new file mode 100644
index 0000000..df46206
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/table-margin-collapse-expected.txt
@@ -0,0 +1,21 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock (anonymous) at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 770x40
+ text run at (0,0) width 438: "The four rectangles below should both be at the top of their columns. "
+ text run at (438,0) width 332: "If one is lower than the other, than the test has failed."
+ text run at (0,20) width 404: "The pattern in each column should be the same (orange/yellow)."
+layer at (8,48) size 784x304
+ RenderBlock {DIV} at (0,40) size 784x304 [border: (2px solid #000000)]
+ RenderTable {TABLE} at (2,2) size 382x500
+ RenderTableSection {TBODY} at (0,0) size 382x500
+ RenderTableRow {TR} at (0,0) size 382x500
+ RenderTableCell {TD} at (0,0) size 191x500 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 191x200 [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,300) size 191x200 [bgcolor=#FFA500]
+ RenderTableCell {TD} at (191,0) size 191x500 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 191x200 [bgcolor=#FFFF00]
+ RenderBlock {DIV} at (0,300) size 191x200 [bgcolor=#FFFF00]
diff --git a/LayoutTests/platform/gtk/fast/multicol/table-vertical-align-expected.txt b/LayoutTests/platform/gtk/fast/multicol/table-vertical-align-expected.txt
new file mode 100644
index 0000000..4293179
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/table-vertical-align-expected.txt
@@ -0,0 +1,400 @@
+layer at (0,0) size 1942x1010
+ RenderView at (0,0) size 781x581
+layer at (0,0) size 1942x1010
+ RenderBlock {HTML} at (0,0) size 781x1010
+ RenderBody {BODY} at (8,8) size 765x994
+ RenderBlock {HR} at (0,358) size 765x2 [border: (1px inset #000000)]
+ RenderBlock {HR} at (0,676) size 765x2 [border: (1px inset #000000)]
+layer at (8,8) size 1544x350
+ RenderBlock {DIV} at (0,0) size 765x350
+ RenderTable {TABLE} at (0,0) size 374x1302 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 372x1300
+ RenderTableRow {TR} at (0,0) size 372x1300
+ RenderTableCell {TD} at (0,45) size 139x1255 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (11,11) size 105x40
+ text run at (11,11) width 105: "This cell has lots"
+ text run at (11,31) width 44: "of text."
+ RenderBR {BR} at (55,46) size 0x0
+ RenderText {#text} at (11,51) size 105x40
+ text run at (11,51) width 105: "This cell has lots"
+ text run at (11,71) width 44: "of text."
+ RenderBR {BR} at (55,86) size 0x0
+ RenderText {#text} at (11,91) size 105x40
+ text run at (11,91) width 105: "This cell has lots"
+ text run at (11,111) width 44: "of text."
+ RenderBR {BR} at (55,126) size 0x0
+ RenderText {#text} at (11,131) size 105x40
+ text run at (11,131) width 105: "This cell has lots"
+ text run at (11,151) width 44: "of text."
+ RenderBR {BR} at (55,166) size 0x0
+ RenderText {#text} at (11,171) size 105x40
+ text run at (11,171) width 105: "This cell has lots"
+ text run at (11,191) width 44: "of text."
+ RenderBR {BR} at (55,206) size 0x0
+ RenderText {#text} at (11,211) size 105x40
+ text run at (11,211) width 105: "This cell has lots"
+ text run at (11,231) width 44: "of text."
+ RenderBR {BR} at (55,246) size 0x0
+ RenderText {#text} at (11,251) size 105x40
+ text run at (11,251) width 105: "This cell has lots"
+ text run at (11,271) width 44: "of text."
+ RenderBR {BR} at (55,286) size 0x0
+ RenderText {#text} at (11,304) size 105x40
+ text run at (11,304) width 105: "This cell has lots"
+ text run at (11,324) width 44: "of text."
+ RenderBR {BR} at (55,339) size 0x0
+ RenderText {#text} at (11,344) size 105x40
+ text run at (11,344) width 105: "This cell has lots"
+ text run at (11,364) width 44: "of text."
+ RenderBR {BR} at (55,379) size 0x0
+ RenderText {#text} at (11,384) size 105x40
+ text run at (11,384) width 105: "This cell has lots"
+ text run at (11,404) width 44: "of text."
+ RenderBR {BR} at (55,419) size 0x0
+ RenderText {#text} at (11,424) size 105x40
+ text run at (11,424) width 105: "This cell has lots"
+ text run at (11,444) width 44: "of text."
+ RenderBR {BR} at (55,459) size 0x0
+ RenderText {#text} at (11,464) size 105x40
+ text run at (11,464) width 105: "This cell has lots"
+ text run at (11,484) width 44: "of text."
+ RenderBR {BR} at (55,499) size 0x0
+ RenderText {#text} at (11,504) size 105x40
+ text run at (11,504) width 105: "This cell has lots"
+ text run at (11,524) width 44: "of text."
+ RenderBR {BR} at (55,539) size 0x0
+ RenderText {#text} at (11,544) size 105x40
+ text run at (11,544) width 105: "This cell has lots"
+ text run at (11,564) width 44: "of text."
+ RenderBR {BR} at (55,579) size 0x0
+ RenderText {#text} at (11,584) size 105x40
+ text run at (11,584) width 105: "This cell has lots"
+ text run at (11,604) width 44: "of text."
+ RenderBR {BR} at (55,619) size 0x0
+ RenderText {#text} at (11,624) size 105x50
+ text run at (11,624) width 105: "This cell has lots"
+ text run at (11,654) width 44: "of text."
+ RenderBR {BR} at (55,669) size 0x0
+ RenderText {#text} at (11,674) size 105x40
+ text run at (11,674) width 105: "This cell has lots"
+ text run at (11,694) width 44: "of text."
+ RenderBR {BR} at (55,709) size 0x0
+ RenderText {#text} at (11,714) size 105x40
+ text run at (11,714) width 105: "This cell has lots"
+ text run at (11,734) width 44: "of text."
+ RenderBR {BR} at (55,749) size 0x0
+ RenderText {#text} at (11,754) size 105x40
+ text run at (11,754) width 105: "This cell has lots"
+ text run at (11,774) width 44: "of text."
+ RenderBR {BR} at (55,789) size 0x0
+ RenderText {#text} at (11,794) size 105x40
+ text run at (11,794) width 105: "This cell has lots"
+ text run at (11,814) width 44: "of text."
+ RenderBR {BR} at (55,829) size 0x0
+ RenderText {#text} at (11,834) size 105x40
+ text run at (11,834) width 105: "This cell has lots"
+ text run at (11,854) width 44: "of text."
+ RenderBR {BR} at (55,869) size 0x0
+ RenderText {#text} at (11,874) size 105x40
+ text run at (11,874) width 105: "This cell has lots"
+ text run at (11,894) width 44: "of text."
+ RenderBR {BR} at (55,909) size 0x0
+ RenderText {#text} at (11,914) size 105x40
+ text run at (11,914) width 105: "This cell has lots"
+ text run at (11,934) width 44: "of text."
+ RenderBR {BR} at (55,949) size 0x0
+ RenderText {#text} at (11,954) size 105x40
+ text run at (11,954) width 105: "This cell has lots"
+ text run at (11,974) width 44: "of text."
+ RenderBR {BR} at (55,989) size 0x0
+ RenderText {#text} at (11,1004) size 105x40
+ text run at (11,1004) width 105: "This cell has lots"
+ text run at (11,1024) width 44: "of text."
+ RenderBR {BR} at (55,1039) size 0x0
+ RenderText {#text} at (11,1044) size 105x40
+ text run at (11,1044) width 105: "This cell has lots"
+ text run at (11,1064) width 44: "of text."
+ RenderBR {BR} at (55,1079) size 0x0
+ RenderText {#text} at (11,1084) size 105x40
+ text run at (11,1084) width 105: "This cell has lots"
+ text run at (11,1104) width 44: "of text."
+ RenderBR {BR} at (55,1119) size 0x0
+ RenderText {#text} at (11,1124) size 105x40
+ text run at (11,1124) width 105: "This cell has lots"
+ text run at (11,1144) width 44: "of text."
+ RenderBR {BR} at (55,1159) size 0x0
+ RenderText {#text} at (11,1164) size 105x40
+ text run at (11,1164) width 105: "This cell has lots"
+ text run at (11,1184) width 44: "of text."
+ RenderBR {BR} at (55,1199) size 0x0
+ RenderText {#text} at (11,1204) size 105x40
+ text run at (11,1204) width 105: "This cell has lots"
+ text run at (11,1224) width 44: "of text."
+ RenderBR {BR} at (55,1239) size 0x0
+ RenderTableCell {TD} at (139,0) size 233x178 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 145x156
+ RenderText {#text} at (11,11) size 145x156
+ text run at (11,11) width 145: "Other"
+ text run at (11,89) width 108: "cell."
+layer at (8,376) size 1934x300
+ RenderBlock {DIV} at (0,368) size 765x300
+ RenderTable {TABLE} at (0,0) size 374x1232 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 372x1230
+ RenderTableRow {TR} at (0,0) size 372x1230
+ RenderTableCell {TD} at (0,0) size 139x1230 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (11,11) size 105x40
+ text run at (11,11) width 105: "This cell has lots"
+ text run at (11,31) width 44: "of text."
+ RenderBR {BR} at (55,46) size 0x0
+ RenderText {#text} at (11,51) size 105x40
+ text run at (11,51) width 105: "This cell has lots"
+ text run at (11,71) width 44: "of text."
+ RenderBR {BR} at (55,86) size 0x0
+ RenderText {#text} at (11,91) size 105x40
+ text run at (11,91) width 105: "This cell has lots"
+ text run at (11,111) width 44: "of text."
+ RenderBR {BR} at (55,126) size 0x0
+ RenderText {#text} at (11,131) size 105x40
+ text run at (11,131) width 105: "This cell has lots"
+ text run at (11,151) width 44: "of text."
+ RenderBR {BR} at (55,166) size 0x0
+ RenderText {#text} at (11,171) size 105x40
+ text run at (11,171) width 105: "This cell has lots"
+ text run at (11,191) width 44: "of text."
+ RenderBR {BR} at (55,206) size 0x0
+ RenderText {#text} at (11,211) size 105x40
+ text run at (11,211) width 105: "This cell has lots"
+ text run at (11,231) width 44: "of text."
+ RenderBR {BR} at (55,246) size 0x0
+ RenderText {#text} at (11,251) size 105x40
+ text run at (11,251) width 105: "This cell has lots"
+ text run at (11,271) width 44: "of text."
+ RenderBR {BR} at (55,286) size 0x0
+ RenderText {#text} at (11,299) size 105x40
+ text run at (11,299) width 105: "This cell has lots"
+ text run at (11,319) width 44: "of text."
+ RenderBR {BR} at (55,334) size 0x0
+ RenderText {#text} at (11,339) size 105x40
+ text run at (11,339) width 105: "This cell has lots"
+ text run at (11,359) width 44: "of text."
+ RenderBR {BR} at (55,374) size 0x0
+ RenderText {#text} at (11,379) size 105x40
+ text run at (11,379) width 105: "This cell has lots"
+ text run at (11,399) width 44: "of text."
+ RenderBR {BR} at (55,414) size 0x0
+ RenderText {#text} at (11,419) size 105x40
+ text run at (11,419) width 105: "This cell has lots"
+ text run at (11,439) width 44: "of text."
+ RenderBR {BR} at (55,454) size 0x0
+ RenderText {#text} at (11,459) size 105x40
+ text run at (11,459) width 105: "This cell has lots"
+ text run at (11,479) width 44: "of text."
+ RenderBR {BR} at (55,494) size 0x0
+ RenderText {#text} at (11,499) size 105x40
+ text run at (11,499) width 105: "This cell has lots"
+ text run at (11,519) width 44: "of text."
+ RenderBR {BR} at (55,534) size 0x0
+ RenderText {#text} at (11,539) size 105x40
+ text run at (11,539) width 105: "This cell has lots"
+ text run at (11,559) width 44: "of text."
+ RenderBR {BR} at (55,574) size 0x0
+ RenderText {#text} at (11,579) size 105x40
+ text run at (11,579) width 105: "This cell has lots"
+ text run at (11,599) width 44: "of text."
+ RenderBR {BR} at (55,614) size 0x0
+ RenderText {#text} at (11,619) size 105x40
+ text run at (11,619) width 105: "This cell has lots"
+ text run at (11,639) width 44: "of text."
+ RenderBR {BR} at (55,654) size 0x0
+ RenderText {#text} at (11,659) size 105x40
+ text run at (11,659) width 105: "This cell has lots"
+ text run at (11,679) width 44: "of text."
+ RenderBR {BR} at (55,694) size 0x0
+ RenderText {#text} at (11,699) size 105x40
+ text run at (11,699) width 105: "This cell has lots"
+ text run at (11,719) width 44: "of text."
+ RenderBR {BR} at (55,734) size 0x0
+ RenderText {#text} at (11,739) size 105x40
+ text run at (11,739) width 105: "This cell has lots"
+ text run at (11,759) width 44: "of text."
+ RenderBR {BR} at (55,774) size 0x0
+ RenderText {#text} at (11,779) size 105x40
+ text run at (11,779) width 105: "This cell has lots"
+ text run at (11,799) width 44: "of text."
+ RenderBR {BR} at (55,814) size 0x0
+ RenderText {#text} at (11,819) size 105x40
+ text run at (11,819) width 105: "This cell has lots"
+ text run at (11,839) width 44: "of text."
+ RenderBR {BR} at (55,854) size 0x0
+ RenderText {#text} at (11,859) size 105x40
+ text run at (11,859) width 105: "This cell has lots"
+ text run at (11,879) width 44: "of text."
+ RenderBR {BR} at (55,894) size 0x0
+ RenderText {#text} at (11,899) size 105x40
+ text run at (11,899) width 105: "This cell has lots"
+ text run at (11,919) width 44: "of text."
+ RenderBR {BR} at (55,934) size 0x0
+ RenderText {#text} at (11,939) size 105x40
+ text run at (11,939) width 105: "This cell has lots"
+ text run at (11,959) width 44: "of text."
+ RenderBR {BR} at (55,974) size 0x0
+ RenderText {#text} at (11,979) size 105x40
+ text run at (11,979) width 105: "This cell has lots"
+ text run at (11,999) width 44: "of text."
+ RenderBR {BR} at (55,1014) size 0x0
+ RenderText {#text} at (11,1019) size 105x40
+ text run at (11,1019) width 105: "This cell has lots"
+ text run at (11,1039) width 44: "of text."
+ RenderBR {BR} at (55,1054) size 0x0
+ RenderText {#text} at (11,1059) size 105x40
+ text run at (11,1059) width 105: "This cell has lots"
+ text run at (11,1079) width 44: "of text."
+ RenderBR {BR} at (55,1094) size 0x0
+ RenderText {#text} at (11,1099) size 105x40
+ text run at (11,1099) width 105: "This cell has lots"
+ text run at (11,1119) width 44: "of text."
+ RenderBR {BR} at (55,1134) size 0x0
+ RenderText {#text} at (11,1139) size 105x40
+ text run at (11,1139) width 105: "This cell has lots"
+ text run at (11,1159) width 44: "of text."
+ RenderBR {BR} at (55,1174) size 0x0
+ RenderText {#text} at (11,1179) size 105x40
+ text run at (11,1179) width 105: "This cell has lots"
+ text run at (11,1199) width 44: "of text."
+ RenderBR {BR} at (55,1214) size 0x0
+ RenderTableCell {TD} at (139,495) size 233x240 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 145x171
+ RenderText {#text} at (11,11) size 145x171
+ text run at (11,11) width 145: "Other"
+ text run at (11,104) width 108: "cell."
+layer at (8,702) size 1934x300
+ RenderBlock {DIV} at (0,694) size 765x300
+ RenderTable {TABLE} at (0,0) size 374x1232 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 372x1230
+ RenderTableRow {TR} at (0,0) size 372x1230
+ RenderTableCell {TD} at (0,0) size 139x1230 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (11,11) size 105x40
+ text run at (11,11) width 105: "This cell has lots"
+ text run at (11,31) width 44: "of text."
+ RenderBR {BR} at (55,46) size 0x0
+ RenderText {#text} at (11,51) size 105x40
+ text run at (11,51) width 105: "This cell has lots"
+ text run at (11,71) width 44: "of text."
+ RenderBR {BR} at (55,86) size 0x0
+ RenderText {#text} at (11,91) size 105x40
+ text run at (11,91) width 105: "This cell has lots"
+ text run at (11,111) width 44: "of text."
+ RenderBR {BR} at (55,126) size 0x0
+ RenderText {#text} at (11,131) size 105x40
+ text run at (11,131) width 105: "This cell has lots"
+ text run at (11,151) width 44: "of text."
+ RenderBR {BR} at (55,166) size 0x0
+ RenderText {#text} at (11,171) size 105x40
+ text run at (11,171) width 105: "This cell has lots"
+ text run at (11,191) width 44: "of text."
+ RenderBR {BR} at (55,206) size 0x0
+ RenderText {#text} at (11,211) size 105x40
+ text run at (11,211) width 105: "This cell has lots"
+ text run at (11,231) width 44: "of text."
+ RenderBR {BR} at (55,246) size 0x0
+ RenderText {#text} at (11,251) size 105x40
+ text run at (11,251) width 105: "This cell has lots"
+ text run at (11,271) width 44: "of text."
+ RenderBR {BR} at (55,286) size 0x0
+ RenderText {#text} at (11,299) size 105x40
+ text run at (11,299) width 105: "This cell has lots"
+ text run at (11,319) width 44: "of text."
+ RenderBR {BR} at (55,334) size 0x0
+ RenderText {#text} at (11,339) size 105x40
+ text run at (11,339) width 105: "This cell has lots"
+ text run at (11,359) width 44: "of text."
+ RenderBR {BR} at (55,374) size 0x0
+ RenderText {#text} at (11,379) size 105x40
+ text run at (11,379) width 105: "This cell has lots"
+ text run at (11,399) width 44: "of text."
+ RenderBR {BR} at (55,414) size 0x0
+ RenderText {#text} at (11,419) size 105x40
+ text run at (11,419) width 105: "This cell has lots"
+ text run at (11,439) width 44: "of text."
+ RenderBR {BR} at (55,454) size 0x0
+ RenderText {#text} at (11,459) size 105x40
+ text run at (11,459) width 105: "This cell has lots"
+ text run at (11,479) width 44: "of text."
+ RenderBR {BR} at (55,494) size 0x0
+ RenderText {#text} at (11,499) size 105x40
+ text run at (11,499) width 105: "This cell has lots"
+ text run at (11,519) width 44: "of text."
+ RenderBR {BR} at (55,534) size 0x0
+ RenderText {#text} at (11,539) size 105x40
+ text run at (11,539) width 105: "This cell has lots"
+ text run at (11,559) width 44: "of text."
+ RenderBR {BR} at (55,574) size 0x0
+ RenderText {#text} at (11,579) size 105x40
+ text run at (11,579) width 105: "This cell has lots"
+ text run at (11,599) width 44: "of text."
+ RenderBR {BR} at (55,614) size 0x0
+ RenderText {#text} at (11,619) size 105x40
+ text run at (11,619) width 105: "This cell has lots"
+ text run at (11,639) width 44: "of text."
+ RenderBR {BR} at (55,654) size 0x0
+ RenderText {#text} at (11,659) size 105x40
+ text run at (11,659) width 105: "This cell has lots"
+ text run at (11,679) width 44: "of text."
+ RenderBR {BR} at (55,694) size 0x0
+ RenderText {#text} at (11,699) size 105x40
+ text run at (11,699) width 105: "This cell has lots"
+ text run at (11,719) width 44: "of text."
+ RenderBR {BR} at (55,734) size 0x0
+ RenderText {#text} at (11,739) size 105x40
+ text run at (11,739) width 105: "This cell has lots"
+ text run at (11,759) width 44: "of text."
+ RenderBR {BR} at (55,774) size 0x0
+ RenderText {#text} at (11,779) size 105x40
+ text run at (11,779) width 105: "This cell has lots"
+ text run at (11,799) width 44: "of text."
+ RenderBR {BR} at (55,814) size 0x0
+ RenderText {#text} at (11,819) size 105x40
+ text run at (11,819) width 105: "This cell has lots"
+ text run at (11,839) width 44: "of text."
+ RenderBR {BR} at (55,854) size 0x0
+ RenderText {#text} at (11,859) size 105x40
+ text run at (11,859) width 105: "This cell has lots"
+ text run at (11,879) width 44: "of text."
+ RenderBR {BR} at (55,894) size 0x0
+ RenderText {#text} at (11,899) size 105x40
+ text run at (11,899) width 105: "This cell has lots"
+ text run at (11,919) width 44: "of text."
+ RenderBR {BR} at (55,934) size 0x0
+ RenderText {#text} at (11,939) size 105x40
+ text run at (11,939) width 105: "This cell has lots"
+ text run at (11,959) width 44: "of text."
+ RenderBR {BR} at (55,974) size 0x0
+ RenderText {#text} at (11,979) size 105x40
+ text run at (11,979) width 105: "This cell has lots"
+ text run at (11,999) width 44: "of text."
+ RenderBR {BR} at (55,1014) size 0x0
+ RenderText {#text} at (11,1019) size 105x40
+ text run at (11,1019) width 105: "This cell has lots"
+ text run at (11,1039) width 44: "of text."
+ RenderBR {BR} at (55,1054) size 0x0
+ RenderText {#text} at (11,1059) size 105x40
+ text run at (11,1059) width 105: "This cell has lots"
+ text run at (11,1079) width 44: "of text."
+ RenderBR {BR} at (55,1094) size 0x0
+ RenderText {#text} at (11,1099) size 105x40
+ text run at (11,1099) width 105: "This cell has lots"
+ text run at (11,1119) width 44: "of text."
+ RenderBR {BR} at (55,1134) size 0x0
+ RenderText {#text} at (11,1139) size 105x40
+ text run at (11,1139) width 105: "This cell has lots"
+ text run at (11,1159) width 44: "of text."
+ RenderBR {BR} at (55,1174) size 0x0
+ RenderText {#text} at (11,1179) size 105x40
+ text run at (11,1179) width 105: "This cell has lots"
+ text run at (11,1199) width 44: "of text."
+ RenderBR {BR} at (55,1214) size 0x0
+ RenderTableCell {TD} at (139,995) size 233x235 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 145x156
+ RenderText {#text} at (11,11) size 145x156
+ text run at (11,11) width 145: "Other"
+ text run at (11,89) width 108: "cell."
diff --git a/LayoutTests/platform/gtk/fast/multicol/unsplittable-inline-block-expected.txt b/LayoutTests/platform/gtk/fast/multicol/unsplittable-inline-block-expected.txt
new file mode 100644
index 0000000..717f533
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/multicol/unsplittable-inline-block-expected.txt
@@ -0,0 +1,44 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+layer at (8,8) size 770x320
+ RenderBlock {DIV} at (0,0) size 770x320 [border: (5px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 367x250
+ RenderBlock (anonymous) at (10,310) size 367x224
+ RenderBlock {DIV} at (0,0) size 301x224 [border: (2px solid #008000)]
+ RenderText {#text} at (2,2) size 297x20
+ text run at (2,2) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,17) size 0x0
+ RenderText {#text} at (2,22) size 297x20
+ text run at (2,22) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,37) size 0x0
+ RenderText {#text} at (2,42) size 297x20
+ text run at (2,42) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,57) size 0x0
+ RenderText {#text} at (2,62) size 297x20
+ text run at (2,62) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,77) size 0x0
+ RenderText {#text} at (2,82) size 297x20
+ text run at (2,82) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,97) size 0x0
+ RenderText {#text} at (2,102) size 297x20
+ text run at (2,102) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,117) size 0x0
+ RenderText {#text} at (2,122) size 297x20
+ text run at (2,122) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,137) size 0x0
+ RenderText {#text} at (2,142) size 297x20
+ text run at (2,142) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,157) size 0x0
+ RenderText {#text} at (2,162) size 297x20
+ text run at (2,162) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,177) size 0x0
+ RenderText {#text} at (2,182) size 297x20
+ text run at (2,182) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,197) size 0x0
+ RenderText {#text} at (2,202) size 297x20
+ text run at (2,202) width 297: "All of this text should be in the second column."
+ RenderBR {BR} at (299,217) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-float-positioned-expected.txt b/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-float-positioned-expected.txt
new file mode 100644
index 0000000..038f35e
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-float-positioned-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (0,0) size 800x600
+ RenderBlock {P} at (0,0) size 800x20
+ RenderText {#text} at (0,0) size 220x20
+ text run at (0,0) width 220: "This is a test for regression against "
+ RenderInline {A} at (0,0) size 305x20 [color=#0000EE]
+ RenderText {#text} at (220,0) size 305x20
+ text run at (220,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=40142"
+ RenderBlock {DIV} at (0,36) size 800x102
+ RenderBlock {DIV} at (0,0) size 602x102 [border: (1px solid #DDDDDD)]
+ RenderBlock (floating) {SPAN} at (309,1) size 292x20
+ RenderText {#text} at (0,0) size 292x20
+ text run at (0,0) width 292: "the quick brown fox jumped over the lazy dog"
+layer at (1,37) size 292x20
+ RenderBlock (positioned) {SPAN} at (1,37) size 292x20
+ RenderText {#text} at (0,0) size 292x20
+ text run at (0,0) width 292: "the quick brown fox jumped over the lazy dog"
diff --git a/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt b/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt
new file mode 100644
index 0000000..e774d1a
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/repaint/block-layout-inline-children-replaced-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (0,0) size 800x600
+ RenderBlock {P} at (0,0) size 800x20
+ RenderText {#text} at (0,0) size 220x20
+ text run at (0,0) width 220: "This is a test for regression against "
+ RenderInline {A} at (0,0) size 305x20 [color=#0000EE]
+ RenderText {#text} at (220,0) size 305x20
+ text run at (220,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=40142"
+ RenderBlock {DIV} at (0,36) size 800x152
+ RenderBlock {DIV} at (0,0) size 402x152 [border: (1px solid #DDDDDD)]
+ RenderImage {IMG} at (155,1) size 92x100
diff --git a/LayoutTests/platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt b/LayoutTests/platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt
new file mode 100644
index 0000000..6c62eda
--- /dev/null
+++ b/LayoutTests/platform/gtk/scrollbars/custom-scrollbar-with-incomplete-style-expected.txt
@@ -0,0 +1,31 @@
+layer at (0,0) size 1538x1423
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 1538x1423
+ RenderBlock {HTML} at (0,0) size 781x1423
+ RenderBody {BODY} at (8,8) size 765x1402
+ RenderBlock {H2} at (0,0) size 765x66
+ RenderText {#text} at (0,0) size 737x66
+ text run at (0,0) width 737: "It's OK if nothing drawn for a scrollbar (for an outermost frame and an"
+ text run at (0,33) width 228: "element with overlow)"
+ RenderBlock {P} at (0,85) size 765x20
+ RenderText {#text} at (0,0) size 579x20
+ text run at (0,0) width 579: "Note that Safari doesn't allow to customize the outermost scdrollbars and just show Cocoa's."
+ RenderBlock {PRE} at (0,234) size 765x1168 [bgcolor=#008000]
+ RenderBlock {PRE} at (0,1415) size 1530x0 [bgcolor=#008000]
+layer at (8,129) size 100x100 clip at (8,129) size 87x87 scrollWidth 1432 scrollHeight 111
+ RenderBlock {PRE} at (0,121) size 100x100 [bgcolor=#008000]
+ RenderText {#text} at (0,0) size 1432x111
+ text run at (0,0) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,0) width 0: " "
+ text run at (0,16) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,16) width 0: " "
+ text run at (0,32) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,32) width 0: " "
+ text run at (0,48) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,48) width 0: " "
+ text run at (0,64) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,64) width 0: " "
+ text run at (0,80) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,80) width 0: " "
+ text run at (0,96) width 1432: "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog."
+ text run at (1432,96) width 0: " "
diff --git a/LayoutTests/platform/gtk/svg/css/composite-shadow-with-opacity-expected.txt b/LayoutTests/platform/gtk/svg/css/composite-shadow-with-opacity-expected.txt
new file mode 100644
index 0000000..26da219
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/css/composite-shadow-with-opacity-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 781x616
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x616
+ RenderBlock {HTML} at (0,0) size 781x616
+ RenderBody {BODY} at (8,8) size 765x600
+layer at (8,8) size 765x600
+ RenderSVGRoot {svg} at (40,36) size 436x150 [opacity=0.50]
+ RenderSVGContainer {g} at (40,36) size 146x140
+ RenderPath {path} at (40,36) size 146x140 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
+ RenderSVGContainer {g} at (200,46) size 128x125
+ RenderPath {path} at (200,46) size 128x125 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,30.00 L-35.27,48.54 L-28.53,9.27 L-57.06,-18.54 L-17.63,-24.27 L0.00,-60.00 L17.63,-24.27 L57.06,-18.54 L28.53,9.27 L35.27,48.54 Z"]
+ RenderSVGContainer {g} at (349,46) size 117x122
+ RenderPath {path} at (349,46) size 117x122 [transform={m=((1.00,0.00)(0.00,1.00)) t=(400.00,100.00)}] [stroke={[type=SOLID] [color=#000000] [stroke width=10.00] [dash array={20.00}]}] [fill={[type=SOLID] [color=#999999]}] [data="M0.00,25.00 L-29.39,40.45 L-23.78,7.73 L-47.55,-15.45 L-14.70,-20.23 L0.00,-50.00 L14.70,-20.23 L47.55,-15.45 L23.78,7.73 L29.39,40.45 Z"]
diff --git a/LayoutTests/platform/gtk/svg/css/shadow-changes-expected.txt b/LayoutTests/platform/gtk/svg/css/shadow-changes-expected.txt
new file mode 100644
index 0000000..b86e4b7
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/css/shadow-changes-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (135,5) size 326x285
+ RenderSVGContainer {g} at (120,0) size 341x290
+ RenderPath {rect} at (135,5) size 215x215 [fill={[type=SOLID] [color=#FF0000]}] [data="M150.00,20.00 L350.00,20.00 L350.00,220.00 L150.00,220.00 Z"]
+ RenderPath {circle} at (205,75) size 215x215 [fill={[type=SOLID] [color=#0000FF]}] [data="M420.00,190.00 L419.80,196.28 L419.21,202.54 L418.23,208.74 L416.86,214.87 L415.11,220.90 L412.98,226.81 L410.48,232.58 L407.63,238.18 L404.43,243.58 L400.90,248.78 L397.05,253.74 L392.90,258.45 L388.45,262.90 L383.74,267.05 L378.78,270.90 L373.58,274.43 L368.18,277.63 L362.58,280.48 L356.81,282.98 L350.90,285.11 L344.87,286.86 L338.74,288.23 L332.54,289.21 L326.28,289.80 L320.00,290.00 L313.72,289.80 L307.46,289.21 L301.26,288.23 L295.13,286.86 L289.10,285.11 L283.19,282.98 L277.42,280.48 L271.82,277.63 L266.42,274.43 L261.22,270.90 L256.26,267.05 L251.55,262.90 L247.10,258.45 L242.95,253.74 L239.10,248.78 L235.57,243.58 L232.37,238.18 L229.52,232.58 L227.02,226.81 L224.89,220.90 L223.14,214.87 L221.77,208.74 L220.79,202.54 L220.20,196.28 L220.00,190.00 L220.20,183.72 L220.79,177.46 L221.77,171.26 L223.14,165.13 L224.89,159.10 L227.02,153.19 L229.52,147.42 L232.37,141.82 L235.57,136.42 L239.10,131.22 L242.95,126.26 L247.10,121.55 L251.55,117.10 L256.26,112.95 L261.22,109.10 L266.42,105.57 L271.82,102.37 L277.42,99.52 L283.19,97.02 L289.10,94.89 L295.13,93.14 L301.26,91.77 L307.46,90.79 L313.72,90.20 L320.00,90.00 L326.28,90.20 L332.54,90.79 L338.74,91.77 L344.87,93.14 L350.90,94.89 L356.81,97.02 L362.58,99.52 L368.18,102.37 L373.58,105.57 L378.78,109.10 L383.74,112.95 L388.45,117.10 L392.90,121.55 L397.05,126.26 L400.90,131.22 L404.43,136.42 L407.63,141.82 L410.48,147.42 L412.98,153.19 L415.11,159.10 L416.86,165.13 L418.23,171.26 L419.21,177.46 L419.80,183.72 Z"]
+ RenderSVGText {text} at (270,30) size 191x122 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 191x122
+ chunk 1 text run 1 at (270.00,120.00) startOffset 0 endOffset 3 width 191.00: "SVG"
diff --git a/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-expected.txt b/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-expected.txt
new file mode 100644
index 0000000..61adf3c
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x550
+ RenderBlock {html} at (0,0) size 800x550
+ RenderBody {body} at (0,0) size 800x550
+layer at (0,0) size 750x550 clip at (0,0) size 734x534 scrollY 1700 scrollHeight 4011
+ RenderBlock {div} at (0,0) size 750x550
+ RenderSVGRoot {svg} at (271,250) size 258x155
+ RenderPath {rect} at (350,250) size 100x100 [fill={[type=SOLID] [color=#000080] [opacity=0.50]}] [data="M350.00,1950.00 L450.00,1950.00 L450.00,2050.00 L350.00,2050.00 Z"]
+ RenderPath {circle} at (350,250) size 100x100 [fill={[type=SOLID] [color=#F08080]}] [data="M450.00,2000.00 L449.90,2003.14 L449.61,2006.27 L449.11,2009.37 L448.43,2012.43 L447.55,2015.45 L446.49,2018.41 L445.24,2021.29 L443.82,2024.09 L442.21,2026.79 L440.45,2029.39 L438.53,2031.87 L436.45,2034.23 L434.23,2036.45 L431.87,2038.53 L429.39,2040.45 L426.79,2042.21 L424.09,2043.82 L421.29,2045.24 L418.41,2046.49 L415.45,2047.55 L412.43,2048.43 L409.37,2049.11 L406.27,2049.61 L403.14,2049.90 L400.00,2050.00 L396.86,2049.90 L393.73,2049.61 L390.63,2049.11 L387.57,2048.43 L384.55,2047.55 L381.59,2046.49 L378.71,2045.24 L375.91,2043.82 L373.21,2042.21 L370.61,2040.45 L368.13,2038.53 L365.77,2036.45 L363.55,2034.23 L361.47,2031.87 L359.55,2029.39 L357.79,2026.79 L356.18,2024.09 L354.76,2021.29 L353.51,2018.41 L352.45,2015.45 L351.57,2012.43 L350.89,2009.37 L350.39,2006.27 L350.10,2003.14 L350.00,2000.00 L350.10,1996.86 L350.39,1993.73 L350.89,1990.63 L351.57,1987.57 L352.45,1984.55 L353.51,1981.59 L354.76,1978.71 L356.18,1975.91 L357.79,1973.21 L359.55,1970.61 L361.47,1968.13 L363.55,1965.77 L365.77,1963.55 L368.13,1961.47 L370.61,1959.55 L373.21,1957.79 L375.91,1956.18 L378.71,1954.76 L381.59,1953.51 L384.55,1952.45 L387.57,1951.57 L390.63,1950.89 L393.73,1950.39 L396.86,1950.10 L400.00,1950.00 L403.14,1950.10 L406.27,1950.39 L409.37,1950.89 L412.43,1951.57 L415.45,1952.45 L418.41,1953.51 L421.29,1954.76 L424.09,1956.18 L426.79,1957.79 L429.39,1959.55 L431.87,1961.47 L434.23,1963.55 L436.45,1965.77 L438.53,1968.13 L440.45,1970.61 L442.21,1973.21 L443.82,1975.91 L445.24,1978.71 L446.49,1981.59 L447.55,1984.55 L448.43,1987.57 L449.11,1990.63 L449.61,1993.73 L449.90,1996.86 Z"]
+ RenderSVGText {text} at (271,2085) size 258x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 258x20
+ chunk 1 (middle anchor) text run 1 at (271.00,2100.00) startOffset 0 endOffset 46 width 258.00: "The test passes if the circle sits in the rect"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.txt b/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.txt
new file mode 100644
index 0000000..2fda3ff
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x550
+ RenderBlock {html} at (0,0) size 800x550
+ RenderBody {body} at (0,0) size 800x550
+layer at (0,0) size 750x550 clip at (0,0) size 734x534 scrollY 300 scrollHeight 1000
+ RenderBlock {div} at (0,0) size 750x550
+layer at (0,-300) size 725x1000 backgroundClip at (0,0) size 725x534 clip at (0,0) size 709x534 outlineClip at (0,0) size 734x534 scrollY 1400 scrollHeight 4101
+ RenderBlock {div} at (0,0) size 725x1000
+ RenderSVGRoot {svg} at (271,250) size 258x155
+ RenderPath {rect} at (350,250) size 100x100 [fill={[type=SOLID] [color=#000080] [opacity=0.50]}] [data="M350.00,1950.00 L450.00,1950.00 L450.00,2050.00 L350.00,2050.00 Z"]
+ RenderPath {circle} at (350,250) size 100x100 [fill={[type=SOLID] [color=#F08080]}] [data="M450.00,2000.00 L449.90,2003.14 L449.61,2006.27 L449.11,2009.37 L448.43,2012.43 L447.55,2015.45 L446.49,2018.41 L445.24,2021.29 L443.82,2024.09 L442.21,2026.79 L440.45,2029.39 L438.53,2031.87 L436.45,2034.23 L434.23,2036.45 L431.87,2038.53 L429.39,2040.45 L426.79,2042.21 L424.09,2043.82 L421.29,2045.24 L418.41,2046.49 L415.45,2047.55 L412.43,2048.43 L409.37,2049.11 L406.27,2049.61 L403.14,2049.90 L400.00,2050.00 L396.86,2049.90 L393.73,2049.61 L390.63,2049.11 L387.57,2048.43 L384.55,2047.55 L381.59,2046.49 L378.71,2045.24 L375.91,2043.82 L373.21,2042.21 L370.61,2040.45 L368.13,2038.53 L365.77,2036.45 L363.55,2034.23 L361.47,2031.87 L359.55,2029.39 L357.79,2026.79 L356.18,2024.09 L354.76,2021.29 L353.51,2018.41 L352.45,2015.45 L351.57,2012.43 L350.89,2009.37 L350.39,2006.27 L350.10,2003.14 L350.00,2000.00 L350.10,1996.86 L350.39,1993.73 L350.89,1990.63 L351.57,1987.57 L352.45,1984.55 L353.51,1981.59 L354.76,1978.71 L356.18,1975.91 L357.79,1973.21 L359.55,1970.61 L361.47,1968.13 L363.55,1965.77 L365.77,1963.55 L368.13,1961.47 L370.61,1959.55 L373.21,1957.79 L375.91,1956.18 L378.71,1954.76 L381.59,1953.51 L384.55,1952.45 L387.57,1951.57 L390.63,1950.89 L393.73,1950.39 L396.86,1950.10 L400.00,1950.00 L403.14,1950.10 L406.27,1950.39 L409.37,1950.89 L412.43,1951.57 L415.45,1952.45 L418.41,1953.51 L421.29,1954.76 L424.09,1956.18 L426.79,1957.79 L429.39,1959.55 L431.87,1961.47 L434.23,1963.55 L436.45,1965.77 L438.53,1968.13 L440.45,1970.61 L442.21,1973.21 L443.82,1975.91 L445.24,1978.71 L446.49,1981.59 L447.55,1984.55 L448.43,1987.57 L449.11,1990.63 L449.61,1993.73 L449.90,1996.86 Z"]
+ RenderSVGText {text} at (271,2085) size 258x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 258x20
+ chunk 1 (middle anchor) text run 1 at (271.00,2100.00) startOffset 0 endOffset 46 width 258.00: "The test passes if the circle sits in the rect"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-svg-area-expected.txt b/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-svg-area-expected.txt
new file mode 100644
index 0000000..7214007
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/getscreenctm-in-scrollable-svg-area-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 781x4005
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x4005
+ RenderBlock {html} at (0,0) size 781x4005
+ RenderBody {body} at (0,0) size 781x4005
+ RenderSVGRoot {svg} at (271,1950) size 258x155
+ RenderPath {rect} at (350,1950) size 100x100 [fill={[type=SOLID] [color=#000080] [opacity=0.50]}] [data="M350.00,1950.00 L450.00,1950.00 L450.00,2050.00 L350.00,2050.00 Z"]
+ RenderPath {circle} at (350,1950) size 100x100 [fill={[type=SOLID] [color=#F08080]}] [data="M450.00,2000.00 L449.90,2003.14 L449.61,2006.27 L449.11,2009.37 L448.43,2012.43 L447.55,2015.45 L446.49,2018.41 L445.24,2021.29 L443.82,2024.09 L442.21,2026.79 L440.45,2029.39 L438.53,2031.87 L436.45,2034.23 L434.23,2036.45 L431.87,2038.53 L429.39,2040.45 L426.79,2042.21 L424.09,2043.82 L421.29,2045.24 L418.41,2046.49 L415.45,2047.55 L412.43,2048.43 L409.37,2049.11 L406.27,2049.61 L403.14,2049.90 L400.00,2050.00 L396.86,2049.90 L393.73,2049.61 L390.63,2049.11 L387.57,2048.43 L384.55,2047.55 L381.59,2046.49 L378.71,2045.24 L375.91,2043.82 L373.21,2042.21 L370.61,2040.45 L368.13,2038.53 L365.77,2036.45 L363.55,2034.23 L361.47,2031.87 L359.55,2029.39 L357.79,2026.79 L356.18,2024.09 L354.76,2021.29 L353.51,2018.41 L352.45,2015.45 L351.57,2012.43 L350.89,2009.37 L350.39,2006.27 L350.10,2003.14 L350.00,2000.00 L350.10,1996.86 L350.39,1993.73 L350.89,1990.63 L351.57,1987.57 L352.45,1984.55 L353.51,1981.59 L354.76,1978.71 L356.18,1975.91 L357.79,1973.21 L359.55,1970.61 L361.47,1968.13 L363.55,1965.77 L365.77,1963.55 L368.13,1961.47 L370.61,1959.55 L373.21,1957.79 L375.91,1956.18 L378.71,1954.76 L381.59,1953.51 L384.55,1952.45 L387.57,1951.57 L390.63,1950.89 L393.73,1950.39 L396.86,1950.10 L400.00,1950.00 L403.14,1950.10 L406.27,1950.39 L409.37,1950.89 L412.43,1951.57 L415.45,1952.45 L418.41,1953.51 L421.29,1954.76 L424.09,1956.18 L426.79,1957.79 L429.39,1959.55 L431.87,1961.47 L434.23,1963.55 L436.45,1965.77 L438.53,1968.13 L440.45,1970.61 L442.21,1973.21 L443.82,1975.91 L445.24,1978.71 L446.49,1981.59 L447.55,1984.55 L448.43,1987.57 L449.11,1990.63 L449.61,1993.73 L449.90,1996.86 Z"]
+ RenderSVGText {text} at (271,2085) size 258x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 258x20
+ chunk 1 (middle anchor) text run 1 at (271.00,2100.00) startOffset 0 endOffset 46 width 258.00: "The test passes if the circle sits in the rect"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-container-expected.txt b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-container-expected.txt
new file mode 100644
index 0000000..17695c2
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-container-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x411
+ RenderBlock {html} at (0,0) size 800x411
+ RenderBody {body} at (0,0) size 800x411
+ RenderSVGRoot {svg} at (45,32) size 361x374
+ RenderSVGContainer {g} at (303,303) size 100x100
+ RenderPath {circle} at (303,303) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M400.00,350.00 L399.90,353.14 L399.61,356.27 L399.11,359.37 L398.43,362.43 L397.55,365.45 L396.49,368.41 L395.24,371.29 L393.82,374.09 L392.21,376.79 L390.45,379.39 L388.53,381.87 L386.45,384.23 L384.23,386.45 L381.87,388.53 L379.39,390.45 L376.79,392.21 L374.09,393.82 L371.29,395.24 L368.41,396.49 L365.45,397.55 L362.43,398.43 L359.37,399.11 L356.27,399.61 L353.14,399.90 L350.00,400.00 L346.86,399.90 L343.73,399.61 L340.63,399.11 L337.57,398.43 L334.55,397.55 L331.59,396.49 L328.71,395.24 L325.91,393.82 L323.21,392.21 L320.61,390.45 L318.13,388.53 L315.77,386.45 L313.55,384.23 L311.47,381.87 L309.55,379.39 L307.79,376.79 L306.18,374.09 L304.76,371.29 L303.51,368.41 L302.45,365.45 L301.57,362.43 L300.89,359.37 L300.39,356.27 L300.10,353.14 L300.00,350.00 L300.10,346.86 L300.39,343.73 L300.89,340.63 L301.57,337.57 L302.45,334.55 L303.51,331.59 L304.76,328.71 L306.18,325.91 L307.79,323.21 L309.55,320.61 L311.47,318.13 L313.55,315.77 L315.77,313.55 L318.13,311.47 L320.61,309.55 L323.21,307.79 L325.91,306.18 L328.71,304.76 L331.59,303.51 L334.55,302.45 L337.57,301.57 L340.63,300.89 L343.73,300.39 L346.86,300.10 L350.00,300.00 L353.14,300.10 L356.27,300.39 L359.37,300.89 L362.43,301.57 L365.45,302.45 L368.41,303.51 L371.29,304.76 L374.09,306.18 L376.79,307.79 L379.39,309.55 L381.87,311.47 L384.23,313.55 L386.45,315.77 L388.53,318.13 L390.45,320.61 L392.21,323.21 L393.82,325.91 L395.24,328.71 L396.49,331.59 L397.55,334.55 L398.43,337.57 L399.11,340.63 L399.61,343.73 L399.90,346.86 Z"]
+ RenderSVGText {text} at (48,35) size 304x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 304x20
+ chunk 1 (middle anchor) text run 1 at (48.50,50.00) startOffset 0 endOffset 49 width 303.00: "The circle should stay in the bottom-right corner"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+caret: position 49 of child 0 {#text} of child 3 {text} of child 1 {svg} of body
diff --git a/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-container-standalone-expected.txt b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-container-standalone-expected.txt
new file mode 100644
index 0000000..37d697e
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-container-standalone-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 406x406
+ RenderSVGRoot {svg} at (45,32) size 361x374
+ RenderSVGContainer {g} at (303,303) size 100x100
+ RenderPath {circle} at (303,303) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M400.00,350.00 L399.90,353.14 L399.61,356.27 L399.11,359.37 L398.43,362.43 L397.55,365.45 L396.49,368.41 L395.24,371.29 L393.82,374.09 L392.21,376.79 L390.45,379.39 L388.53,381.87 L386.45,384.23 L384.23,386.45 L381.87,388.53 L379.39,390.45 L376.79,392.21 L374.09,393.82 L371.29,395.24 L368.41,396.49 L365.45,397.55 L362.43,398.43 L359.37,399.11 L356.27,399.61 L353.14,399.90 L350.00,400.00 L346.86,399.90 L343.73,399.61 L340.63,399.11 L337.57,398.43 L334.55,397.55 L331.59,396.49 L328.71,395.24 L325.91,393.82 L323.21,392.21 L320.61,390.45 L318.13,388.53 L315.77,386.45 L313.55,384.23 L311.47,381.87 L309.55,379.39 L307.79,376.79 L306.18,374.09 L304.76,371.29 L303.51,368.41 L302.45,365.45 L301.57,362.43 L300.89,359.37 L300.39,356.27 L300.10,353.14 L300.00,350.00 L300.10,346.86 L300.39,343.73 L300.89,340.63 L301.57,337.57 L302.45,334.55 L303.51,331.59 L304.76,328.71 L306.18,325.91 L307.79,323.21 L309.55,320.61 L311.47,318.13 L313.55,315.77 L315.77,313.55 L318.13,311.47 L320.61,309.55 L323.21,307.79 L325.91,306.18 L328.71,304.76 L331.59,303.51 L334.55,302.45 L337.57,301.57 L340.63,300.89 L343.73,300.39 L346.86,300.10 L350.00,300.00 L353.14,300.10 L356.27,300.39 L359.37,300.89 L362.43,301.57 L365.45,302.45 L368.41,303.51 L371.29,304.76 L374.09,306.18 L376.79,307.79 L379.39,309.55 L381.87,311.47 L384.23,313.55 L386.45,315.77 L388.53,318.13 L390.45,320.61 L392.21,323.21 L393.82,325.91 L395.24,328.71 L396.49,331.59 L397.55,334.55 L398.43,337.57 L399.11,340.63 L399.61,343.73 L399.90,346.86 Z"]
+ RenderSVGText {text} at (48,35) size 304x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 304x20
+ chunk 1 (middle anchor) text run 1 at (48.50,50.00) startOffset 0 endOffset 49 width 303.00: "The circle should stay in the bottom-right corner"
+caret: position 49 of child 0 {#text} of child 3 {text} of child 0 {svg} of document
diff --git a/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-root-expected.txt b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-root-expected.txt
new file mode 100644
index 0000000..de5e74e
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-root-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x411
+ RenderBlock {html} at (0,0) size 800x411
+ RenderBody {body} at (0,0) size 800x411
+ RenderSVGRoot {svg} at (90,32) size 226x224
+ RenderPath {circle} at (150,150) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M247.00,197.00 L246.90,200.14 L246.61,203.27 L246.11,206.37 L245.43,209.43 L244.55,212.45 L243.49,215.41 L242.24,218.29 L240.82,221.09 L239.21,223.79 L237.45,226.39 L235.53,228.87 L233.45,231.23 L231.23,233.45 L228.87,235.53 L226.39,237.45 L223.79,239.21 L221.09,240.82 L218.29,242.24 L215.41,243.49 L212.45,244.55 L209.43,245.43 L206.37,246.11 L203.27,246.61 L200.14,246.90 L197.00,247.00 L193.86,246.90 L190.73,246.61 L187.63,246.11 L184.57,245.43 L181.55,244.55 L178.59,243.49 L175.71,242.24 L172.91,240.82 L170.21,239.21 L167.61,237.45 L165.13,235.53 L162.77,233.45 L160.55,231.23 L158.47,228.87 L156.55,226.39 L154.79,223.79 L153.18,221.09 L151.76,218.29 L150.51,215.41 L149.45,212.45 L148.57,209.43 L147.89,206.37 L147.39,203.27 L147.10,200.14 L147.00,197.00 L147.10,193.86 L147.39,190.73 L147.89,187.63 L148.57,184.57 L149.45,181.55 L150.51,178.59 L151.76,175.71 L153.18,172.91 L154.79,170.21 L156.55,167.61 L158.47,165.13 L160.55,162.77 L162.77,160.55 L165.13,158.47 L167.61,156.55 L170.21,154.79 L172.91,153.18 L175.71,151.76 L178.59,150.51 L181.55,149.45 L184.57,148.57 L187.63,147.89 L190.73,147.39 L193.86,147.10 L197.00,147.00 L200.14,147.10 L203.27,147.39 L206.37,147.89 L209.43,148.57 L212.45,149.45 L215.41,150.51 L218.29,151.76 L221.09,153.18 L223.79,154.79 L226.39,156.55 L228.87,158.47 L231.23,160.55 L233.45,162.77 L235.53,165.13 L237.45,167.61 L239.21,170.21 L240.82,172.91 L242.24,175.71 L243.49,178.59 L244.55,181.55 L245.43,184.57 L246.11,187.63 L246.61,190.73 L246.90,193.86 Z"]
+ RenderSVGText {text} at (93,35) size 214x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 214x20
+ chunk 1 (middle anchor) text run 1 at (93.00,50.00) startOffset 0 endOffset 34 width 214.00: "The circle should be in the middle"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+caret: position 34 of child 0 {#text} of child 3 {text} of child 1 {svg} of body
diff --git a/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-root-standalone-expected.txt b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-root-standalone-expected.txt
new file mode 100644
index 0000000..bd032f1
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/custom/mouse-move-on-svg-root-standalone-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 406x406
+ RenderSVGRoot {svg} at (90,32) size 226x224
+ RenderPath {circle} at (150,150) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M247.00,197.00 L246.90,200.14 L246.61,203.27 L246.11,206.37 L245.43,209.43 L244.55,212.45 L243.49,215.41 L242.24,218.29 L240.82,221.09 L239.21,223.79 L237.45,226.39 L235.53,228.87 L233.45,231.23 L231.23,233.45 L228.87,235.53 L226.39,237.45 L223.79,239.21 L221.09,240.82 L218.29,242.24 L215.41,243.49 L212.45,244.55 L209.43,245.43 L206.37,246.11 L203.27,246.61 L200.14,246.90 L197.00,247.00 L193.86,246.90 L190.73,246.61 L187.63,246.11 L184.57,245.43 L181.55,244.55 L178.59,243.49 L175.71,242.24 L172.91,240.82 L170.21,239.21 L167.61,237.45 L165.13,235.53 L162.77,233.45 L160.55,231.23 L158.47,228.87 L156.55,226.39 L154.79,223.79 L153.18,221.09 L151.76,218.29 L150.51,215.41 L149.45,212.45 L148.57,209.43 L147.89,206.37 L147.39,203.27 L147.10,200.14 L147.00,197.00 L147.10,193.86 L147.39,190.73 L147.89,187.63 L148.57,184.57 L149.45,181.55 L150.51,178.59 L151.76,175.71 L153.18,172.91 L154.79,170.21 L156.55,167.61 L158.47,165.13 L160.55,162.77 L162.77,160.55 L165.13,158.47 L167.61,156.55 L170.21,154.79 L172.91,153.18 L175.71,151.76 L178.59,150.51 L181.55,149.45 L184.57,148.57 L187.63,147.89 L190.73,147.39 L193.86,147.10 L197.00,147.00 L200.14,147.10 L203.27,147.39 L206.37,147.89 L209.43,148.57 L212.45,149.45 L215.41,150.51 L218.29,151.76 L221.09,153.18 L223.79,154.79 L226.39,156.55 L228.87,158.47 L231.23,160.55 L233.45,162.77 L235.53,165.13 L237.45,167.61 L239.21,170.21 L240.82,172.91 L242.24,175.71 L243.49,178.59 L244.55,181.55 L245.43,184.57 L246.11,187.63 L246.61,190.73 L246.90,193.86 Z"]
+ RenderSVGText {text} at (93,35) size 214x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 214x20
+ chunk 1 (middle anchor) text run 1 at (93.00,50.00) startOffset 0 endOffset 34 width 214.00: "The circle should be in the middle"
+caret: position 34 of child 0 {#text} of child 3 {text} of child 0 {svg} of document
diff --git a/LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt b/LayoutTests/platform/gtk/svg/custom/non-scaling-stroke-markers-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/svg/custom/non-scaling-stroke-markers-expected.txt
copy to LayoutTests/platform/gtk/svg/custom/non-scaling-stroke-markers-expected.txt
diff --git a/LayoutTests/platform/mac-snowleopard/svg/custom/use-invalid-pattern-expected.txt b/LayoutTests/platform/gtk/svg/custom/use-invalid-pattern-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-snowleopard/svg/custom/use-invalid-pattern-expected.txt
copy to LayoutTests/platform/gtk/svg/custom/use-invalid-pattern-expected.txt
diff --git a/LayoutTests/platform/gtk/svg/repaint/filter-repaint-expected.txt b/LayoutTests/platform/gtk/svg/repaint/filter-repaint-expected.txt
new file mode 100644
index 0000000..1fbe5b0
--- /dev/null
+++ b/LayoutTests/platform/gtk/svg/repaint/filter-repaint-expected.txt
@@ -0,0 +1,59 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 400x400
+ RenderSVGRoot {svg} at (10,10) size 182x185
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGResourceFilter {filter} [id="over"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
+ [feComposite operation="OVER"]
+ [feFlood flood-color="#0000FF" flood-opacity="0.50"]
+ [feFlood flood-color="#FF0000" flood-opacity="0.50"]
+ RenderSVGResourceFilter {filter} [id="in"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
+ [feComposite operation="IN"]
+ [feFlood flood-color="#0000FF" flood-opacity="0.50"]
+ [feFlood flood-color="#FF0000" flood-opacity="0.50"]
+ RenderSVGResourceFilter {filter} [id="out"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
+ [feComposite operation="OUT"]
+ [feFlood flood-color="#0000FF" flood-opacity="0.50"]
+ [feFlood flood-color="#FF0000" flood-opacity="0.50"]
+ RenderSVGResourceFilter {filter} [id="atop"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
+ [feComposite operation="ATOP"]
+ [feFlood flood-color="#0000FF" flood-opacity="0.50"]
+ [feFlood flood-color="#FF0000" flood-opacity="0.50"]
+ RenderSVGResourceFilter {filter} [id="xor"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
+ [feComposite operation="XOR"]
+ [feFlood flood-color="#0000FF" flood-opacity="0.50"]
+ [feFlood flood-color="#FF0000" flood-opacity="0.50"]
+ RenderSVGResourceFilter {filter} [id="arithmetic"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
+ [feComposite operation="ARITHMETIC" k1="0.50" k2="0.50" k3="0.50" k4="0.50"]
+ [feFlood flood-color="#0000FF" flood-opacity="0.50"]
+ [feFlood flood-color="#FF0000" flood-opacity="0.20"]
+ RenderPath {rect} at (10,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M10.00,10.00 L60.00,10.00 L60.00,60.00 L10.00,60.00 Z"]
+ [filter="over"] RenderSVGResourceFilter {filter} at (10,10) size 50x50
+ RenderSVGText {text} at (10,75) size 28x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 28x20
+ chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 4 width 28.00: "over"
+ RenderPath {rect} at (70,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M70.00,10.00 L120.00,10.00 L120.00,60.00 L70.00,60.00 Z"]
+ [filter="in"] RenderSVGResourceFilter {filter} at (70,10) size 50x50
+ RenderSVGText {text} at (70,75) size 12x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 12x20
+ chunk 1 text run 1 at (70.00,90.00) startOffset 0 endOffset 2 width 12.00: "in"
+ RenderPath {rect} at (130,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M130.00,10.00 L180.00,10.00 L180.00,60.00 L130.00,60.00 Z"]
+ [filter="out"] RenderSVGResourceFilter {filter} at (130,10) size 50x50
+ RenderSVGText {text} at (130,75) size 20x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 20x20
+ chunk 1 text run 1 at (130.00,90.00) startOffset 0 endOffset 3 width 20.00: "out"
+ RenderPath {rect} at (10,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M10.00,110.00 L60.00,110.00 L60.00,160.00 L10.00,160.00 Z"]
+ [filter="atop"] RenderSVGResourceFilter {filter} at (10,110) size 50x50
+ RenderSVGText {text} at (10,175) size 27x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 27x20
+ chunk 1 text run 1 at (10.00,190.00) startOffset 0 endOffset 4 width 27.00: "atop"
+ RenderPath {rect} at (70,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M70.00,110.00 L120.00,110.00 L120.00,160.00 L70.00,160.00 Z"]
+ [filter="xor"] RenderSVGResourceFilter {filter} at (70,110) size 50x50
+ RenderSVGText {text} at (70,175) size 21x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 21x20
+ chunk 1 text run 1 at (70.00,190.00) startOffset 0 endOffset 3 width 21.00: "xor"
+ RenderPath {rect} at (130,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M130.00,110.00 L180.00,110.00 L180.00,160.00 L130.00,160.00 Z"]
+ [filter="arithmetic"] RenderSVGResourceFilter {filter} at (130,110) size 50x50
+ RenderSVGText {text} at (130,175) size 62x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 62x20
+ chunk 1 text run 1 at (130.00,190.00) startOffset 0 endOffset 10 width 62.00: "arithmetic"
diff --git a/LayoutTests/platform/gtk/transitions/svg-text-shadow-transition-expected.txt b/LayoutTests/platform/gtk/transitions/svg-text-shadow-transition-expected.txt
new file mode 100644
index 0000000..279b4ec
--- /dev/null
+++ b/LayoutTests/platform/gtk/transitions/svg-text-shadow-transition-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x161
+ RenderBlock {HTML} at (0,0) size 800x161
+ RenderBody {BODY} at (8,8) size 784x145
+ RenderBlock (anonymous) at (0,0) size 784x105
+ RenderSVGRoot {svg} at (8,9) size 307x83
+ RenderSVGText {text} at (10,11) size 277x53 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 277x53
+ chunk 1 text run 1 at (10.00,50.00) startOffset 0 endOffset 15 width 277.00: "Shadow on texts"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,105) size 784x40
+ RenderText {#text} at (0,0) size 577x20
+ text run at (0,0) width 577: "PASS - \"text-shadow\" property for \"text\" element at 0s saw something close to: -25,-5,0,15"
+ RenderBR {BR} at (577,0) size 0x20
+ RenderText {#text} at (0,20) size 559x20
+ text run at (0,20) width 559: "PASS - \"text-shadow\" property for \"text\" element at 1s saw something close to: 5,5,0,15"
+ RenderBR {BR} at (559,20) size 0x20
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list