Inline elements whose parents have small line-height are laid out too low

https://bugs.webkit.org/show_bug.cgi?id=139375

Reviewed by Dave Hyatt.

Source/WebCore:

This is a port of the Blink patch at
https://src.chromium.org/viewvc/blink?revision=155253&view=revision.

When laying out inline elements, we try to align leaf children's parents'
baselines across the entire line. However, if you set line-height: 0px on a
span, the entire InlineBox which represents that span will have a height of
0, and therefore be laid out entirely on the baseline. In addition, we will
try to vertically center the leaf text in the span's InlineBox, which means
the leaf text will be vertically centered on the baseline. All the other
major browsers do not have this behavior; instead, they line up the boxes
as you would expect.

This bug led to a rendering problem on the front page of the New York Times.

Here is the ChangeLog from the Blink patch:

Fix baseline position when it is outside the element's box

Specifically, we shouldn't force the baseline to be inside the element. IE
and FF don't do this, and it's incompatible with the CSS spec:

"The baseline of an 'inline-block' is the baseline of its last line box in
the normal flow, unless it has either no in-flow line boxes or if its
'overflow' property has a computed value other than 'visible', in which case
the baseline is the bottom margin edge."
-- http://www.w3.org/TR/CSS21/visudet.html#leading

It doesn't have a special case for "baseline is outside of the element's
margin box".

Test: fast/text/small-line-height.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::baselinePosition):

LayoutTests:

Add fast/text/small-line-height.html for a simple example. In addition, update
existing tests.

* fast/forms/textfield-overflow-by-value-update-expected.txt:
* fast/regions/cssom/client-rects-inline-complex.html:
* fast/regions/overflow/overflow-region-inline-expected.html:
* fast/text/small-line-height-expected.html: Added.
* fast/text/small-line-height.html: Added.
* platform/mac/fast/box-sizing/box-sizing-expected.png:
* platform/mac/fast/box-sizing/box-sizing-expected.txt:
* platform/mac/fast/forms/search-vertical-alignment-expected.png:
* platform/mac/fast/forms/search-vertical-alignment-expected.txt:
* platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png: Removed.
* platform/mac/fast/multicol/client-rects-expected.png:
* platform/mac/fast/multicol/client-rects-expected.txt:
* platform/mac/fast/multicol/client-rects-spanners-complex-expected.png:
* platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt:
* platform/mac/fast/multicol/client-rects-spanners-expected.png:
* platform/mac/fast/multicol/client-rects-spanners-expected.txt:
* platform/mac/fast/multicol/layers-split-across-columns-expected.png:
* platform/mac/fast/multicol/layers-split-across-columns-expected.txt:
* platform/mac/fast/multicol/newmulticol/client-rects-expected.png:
* platform/mac/fast/multicol/newmulticol/client-rects-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4ad075d3d0537a5457ae4b7846c236b7b49e698c..1856e76b54dcb782e3d74e80696771ce4304029d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,34 @@
+2014-12-08  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Inline elements whose parents have small line-height are laid out too low
+        https://bugs.webkit.org/show_bug.cgi?id=139375
+
+        Reviewed by Dave Hyatt.
+
+        Add fast/text/small-line-height.html for a simple example. In addition, update
+        existing tests.
+
+        * fast/forms/textfield-overflow-by-value-update-expected.txt:
+        * fast/regions/cssom/client-rects-inline-complex.html:
+        * fast/regions/overflow/overflow-region-inline-expected.html:
+        * fast/text/small-line-height-expected.html: Added.
+        * fast/text/small-line-height.html: Added.
+        * platform/mac/fast/box-sizing/box-sizing-expected.png:
+        * platform/mac/fast/box-sizing/box-sizing-expected.txt:
+        * platform/mac/fast/forms/search-vertical-alignment-expected.png:
+        * platform/mac/fast/forms/search-vertical-alignment-expected.txt:
+        * platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png: Removed.
+        * platform/mac/fast/multicol/client-rects-expected.png:
+        * platform/mac/fast/multicol/client-rects-expected.txt:
+        * platform/mac/fast/multicol/client-rects-spanners-complex-expected.png:
+        * platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt:
+        * platform/mac/fast/multicol/client-rects-spanners-expected.png:
+        * platform/mac/fast/multicol/client-rects-spanners-expected.txt:
+        * platform/mac/fast/multicol/layers-split-across-columns-expected.png:
+        * platform/mac/fast/multicol/layers-split-across-columns-expected.txt:
+        * platform/mac/fast/multicol/newmulticol/client-rects-expected.png:
+        * platform/mac/fast/multicol/newmulticol/client-rects-expected.txt:
+
 2014-12-08  Mark Lam  <mark.lam@apple.com>
 
         CFA wrongly assumes that a speculation for SlowPutArrayStorageShape disallows ArrayStorageShape arrays.

diff --git a/LayoutTests/fast/box-sizing/box-sizing.html b/LayoutTests/fast/box-sizing/box-sizing.html
index 99dc517f5a90a5448ff35812359f86d02192994d..178cd3c218efa21da3d9770fe55e099c8167bffb 100644 (file)
--- a/LayoutTests/fast/box-sizing/box-sizing.html
+++ b/LayoutTests/fast/box-sizing/box-sizing.html
@@ -12,7 +12,7 @@ div, img {
 </style>
 </head>
 <body>
-All of the boxes below should be 20x20 and look identical.
+All of the boxes below should be 20x20 and look identical, except for the rightmost box in the Inline Blocks section, which should look the same but be raised above the other three in that section.
 
 <h1>Normal Blocks</h1>
 

diff --git a/LayoutTests/fast/forms/textfield-overflow-by-value-update-expected.txt b/LayoutTests/fast/forms/textfield-overflow-by-value-update-expected.txt
index 40b5941750450d60d60bb85b232159a3155ce1df..5c19c7589c688cfdce2a7e35f5b02b4f4735815c 100644 (file)
--- a/LayoutTests/fast/forms/textfield-overflow-by-value-update-expected.txt
+++ b/LayoutTests/fast/forms/textfield-overflow-by-value-update-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x34
-  RenderBlock {HTML} at (0,0) size 800x34
-    RenderBody {BODY} at (8,8) size 784x18
-      RenderTextControl {INPUT} at (0,12) size 102x2 [bgcolor=#FFFFFF]
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,8) size 784x36
+      RenderTextControl {INPUT} at (0,0) size 102x2 [bgcolor=#FFFFFF]
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/regions/cssom/client-rects-inline-complex.html b/LayoutTests/fast/regions/cssom/client-rects-inline-complex.html
index e0d7e78902c031bec7bd15a93c77c56dddbb99d1..63cb401cde38cb2a5e69c9935c366cad6aaeb827 100644 (file)
--- a/LayoutTests/fast/regions/cssom/client-rects-inline-complex.html
+++ b/LayoutTests/fast/regions/cssom/client-rects-inline-complex.html
@@ -71,7 +71,7 @@
         if (window.testRunner)
             testRunner.dumpAsText();
         
-        var contentClientRects = [[11, 11, 221, 211, 200, 210], [31, 221, 51, 471, 250, 20]];
+        var contentClientRects = [[11, 11, 221, 211, 200, 210], [31, 221, 91, 471, 250, 60]];
         var inlineBlockClientRects = [[51, 91, 143, 183, 92, 92]];
         var insideInlineBlockClientRects = [[57, 97, 485, 177, 80, 428]];
         var imageClientRects = [[68, 108, 470, 410, 302, 402]];

diff --git a/LayoutTests/fast/regions/overflow/overflow-region-inline-expected.html b/LayoutTests/fast/regions/overflow/overflow-region-inline-expected.html
index 52d52dd8d768d77e4ce9ccff7aef2c6ddd038601..fd4be3fb435d1bae06bbb56e006898e11bb8fd55 100644 (file)
--- a/LayoutTests/fast/regions/overflow/overflow-region-inline-expected.html
+++ b/LayoutTests/fast/regions/overflow/overflow-region-inline-expected.html
@@ -35,6 +35,7 @@
                 top: 160px;
                 padding: 10px;
                 width: 700px;
+                height: 135px;
             }
             .keyword {
                 color: red;
@@ -51,14 +52,14 @@
         </ul>
         <div id="regionContainer">
             <span class="opacity">
-                <b>y<i>x <div id="region"></i></b>
+                <b style="position: relative; left: 0px; top: -101px;">y<i>x </i></b><div id="region">
                     <div id="content">
                         <div>This region has<br/><span class="keyword">display: inline-block</span> and is sitting inside an <span class="keyword">i</span>, inside a <span class="keyword">b</span> with 0.5 opacity and inside a <span class="keyword">span</span>,</div>
                         <br/><br/>
                         <div class="overflow">causing it to be part of a complex tree of line elements.</div>
                         <div class="overflow">Overflow2_1_Overflow2_1_Overflow2_1</div>
                     </div>
-                </div>  <b><i>x</i>y</b>
+                </div>  <b style="position: relative; left: 0px; top: -101px;"><i>x</i>y</b>
             </span>
             <div id="regionInSpan">
                 <div id="content2">

diff --git a/LayoutTests/fast/text/small-line-height-expected.html b/LayoutTests/fast/text/small-line-height-expected.html
new file mode 100644 (file)
index 0000000..1d61236
--- /dev/null
+++ b/LayoutTests/fast/text/small-line-height-expected.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+WordAnother word
+</body>
+</html>

diff --git a/LayoutTests/fast/text/small-line-height.html b/LayoutTests/fast/text/small-line-height.html
new file mode 100644 (file)
index 0000000..5cb5da3
--- /dev/null
+++ b/LayoutTests/fast/text/small-line-height.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<span style="display: inline-block; line-height: 0px;">Word</span>Another word
+</body>
+</html>

diff --git a/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.png b/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.png
new file mode 100644 (file)
index 0000000..11d322b
Binary files /dev/null and b/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.png differ

diff --git a/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt b/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt
index 2da8c1f16243be3c9ee6ea70acedecd9e1dece81..c5cb13e0851390bff17a06601a255be0e74a2818 100644 (file)
--- a/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt
+++ b/LayoutTests/platform/mac-mountainlion/fast/forms/search-vertical-alignment-expected.txt
@@ -31,14 +31,14 @@ layer at (0,0) size 800x600
         RenderTextControl {INPUT} at (163,2) size 123x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,147) size 784x18
-        RenderTextControl {INPUT} at (2,2) size 153x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderTextControl {INPUT} at (2,0) size 153x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,0) size 147x12
             RenderBlock {DIV} at (0,0) size 17x12
             RenderBlock {DIV} at (17,3) size 117x6
             RenderBlock {DIV} at (134,0) size 13x12
         RenderText {#text} at (157,0) size 4x18
           text run at (157,0) width 4: " "
-        RenderTextControl {INPUT} at (163,2) size 123x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderTextControl {INPUT} at (163,0) size 123x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
 layer at (30,76) size 117x13
   RenderBlock {DIV} at (0,0) size 117x13
@@ -56,11 +56,11 @@ layer at (174,124) size 117x13
   RenderBlock {DIV} at (3,1) size 117x13
     RenderText {#text} at (0,0) size 24x13
       text run at (0,0) width 24: "Text"
-layer at (30,160) size 117x6 scrollHeight 13
+layer at (30,158) size 117x6 scrollHeight 13
   RenderBlock {DIV} at (0,0) size 117x6
     RenderText {#text} at (0,0) size 24x13
       text run at (0,0) width 24: "Text"
-layer at (174,160) size 117x6 scrollHeight 13
+layer at (174,158) size 117x6 scrollHeight 13
   RenderBlock {DIV} at (3,3) size 117x6
     RenderText {#text} at (0,0) size 24x13
       text run at (0,0) width 24: "Text"

diff --git a/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.png b/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.png
index 93f899f8a9c17ba3c7f013afc33746b523380a77..8ae1f35a9866d0fdfc105a749e25acbc888c9f76 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.png and b/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt b/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt
index 4d0dcbddfb1b81039b0eeabf7d0acd0e3c3feef8..249dec17631a61076eec952a41022bcc80e111e2 100644 (file)
--- a/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt
+++ b/LayoutTests/platform/mac/fast/box-sizing/box-sizing-expected.txt
@@ -1,90 +1,91 @@
-layer at (0,0) size 785x909
+layer at (0,0) size 785x953
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x909
-  RenderBlock {HTML} at (0,0) size 785x910
-    RenderBody {BODY} at (8,8) size 769x894
-      RenderBlock (anonymous) at (0,0) size 769x18
-        RenderText {#text} at (0,0) size 373x18
-          text run at (0,0) width 373: "All of the boxes below should be 20x20 and look identical."
-      RenderBlock {H1} at (0,39) size 769x38
+layer at (0,0) size 785x953
+  RenderBlock {HTML} at (0,0) size 785x954
+    RenderBody {BODY} at (8,8) size 769x938
+      RenderBlock (anonymous) at (0,0) size 769x36
+        RenderText {#text} at (0,0) size 733x36
+          text run at (0,0) width 733: "All of the boxes below should be 20x20 and look identical, except for the rightmost box in the Inline Blocks section,"
+          text run at (0,18) width 491: "which should look the same but be raised above the other three in that section."
+      RenderBlock {H1} at (0,57) size 769x38
         RenderText {#text} at (0,0) size 203x37
           text run at (0,0) width 203: "Normal Blocks"
-      RenderBlock {DIV} at (5,97) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock {DIV} at (5,127) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock {DIV} at (5,157) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock {DIV} at (5,187) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock {DIV} at (5,115) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock {DIV} at (5,145) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock {DIV} at (5,175) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock {DIV} at (5,205) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderBR {BR} at (6,6) size 0x18
         RenderBR {BR} at (6,24) size 0x18
         RenderBR {BR} at (6,42) size 0x18
-      RenderBlock {H1} at (0,229) size 769x38
+      RenderBlock {H1} at (0,247) size 769x38
         RenderText {#text} at (0,0) size 178x37
           text run at (0,0) width 178: "Inline Blocks"
-      RenderBlock (anonymous) at (0,287) size 769x41
-        RenderBlock {DIV} at (5,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-        RenderBlock {DIV} at (35,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-        RenderBlock {DIV} at (65,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock (anonymous) at (0,305) size 769x67
+        RenderBlock {DIV} at (5,36) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+        RenderBlock {DIV} at (35,36) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+        RenderBlock {DIV} at (65,36) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderBlock {DIV} at (95,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
           RenderBR {BR} at (6,6) size 0x18
           RenderBR {BR} at (6,24) size 0x18
           RenderBR {BR} at (6,42) size 0x18
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {H1} at (0,349) size 769x38
+      RenderBlock {H1} at (0,393) size 769x38
         RenderText {#text} at (0,0) size 241x37
           text run at (0,0) width 241: "Positioned Blocks"
-      RenderBlock (anonymous) at (0,407) size 769x19
+      RenderBlock (anonymous) at (0,451) size 769x19
         RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {H1} at (0,447) size 769x38
+      RenderBlock {H1} at (0,491) size 769x38
         RenderText {#text} at (0,0) size 210x37
           text run at (0,0) width 210: "Floating blocks"
-      RenderBlock (floating) {DIV} at (5,515) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock (floating) {DIV} at (35,515) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock (floating) {DIV} at (65,515) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock (floating) {DIV} at (95,515) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock (floating) {DIV} at (5,559) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock (floating) {DIV} at (35,559) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock (floating) {DIV} at (65,559) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock (floating) {DIV} at (95,559) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderBR {BR} at (6,6) size 0x18
         RenderBR {BR} at (6,24) size 0x18
         RenderBR {BR} at (6,42) size 0x18
-      RenderBlock (anonymous) at (0,505) size 769x41
+      RenderBlock (anonymous) at (0,549) size 769x41
         RenderBR {BR} at (120,0) size 0x18
-      RenderBlock {H1} at (0,566) size 769x38
+      RenderBlock {H1} at (0,610) size 769x38
         RenderText {#text} at (0,0) size 210x37
           text run at (0,0) width 210: "Normal Images"
-      RenderBlock (anonymous) at (0,625) size 769x41
+      RenderBlock (anonymous) at (0,669) size 769x41
         RenderImage {IMG} at (5,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderImage {IMG} at (35,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderImage {IMG} at (65,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderImage {IMG} at (95,10) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {H1} at (0,686) size 769x38
+      RenderBlock {H1} at (0,730) size 769x38
         RenderText {#text} at (0,0) size 248x37
           text run at (0,0) width 248: "Positioned Images"
-      RenderBlock (anonymous) at (0,745) size 769x19
+      RenderBlock (anonymous) at (0,789) size 769x19
         RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {H1} at (0,784) size 769x38
+      RenderBlock {H1} at (0,828) size 769x38
         RenderText {#text} at (0,0) size 220x37
           text run at (0,0) width 220: "Floating Images"
-      RenderImage {IMG} at (5,853) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderImage {IMG} at (35,853) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderImage {IMG} at (65,853) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderImage {IMG} at (95,853) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-      RenderBlock (anonymous) at (0,843) size 769x41
+      RenderImage {IMG} at (5,897) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderImage {IMG} at (35,897) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderImage {IMG} at (65,897) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderImage {IMG} at (95,897) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock (anonymous) at (0,887) size 769x41
         RenderBR {BR} at (120,0) size 0x18
-      RenderBlock {HR} at (0,891) size 769x3 [border: (1px inset #000000)]
-layer at (13,426) size 20x20
-  RenderBlock (positioned) {DIV} at (13,425) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (43,426) size 20x20
-  RenderBlock (positioned) {DIV} at (43,425) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (73,426) size 20x20
-  RenderBlock (positioned) {DIV} at (73,425) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (103,426) size 20x20
-  RenderBlock (positioned) {DIV} at (103,425) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+      RenderBlock {HR} at (0,935) size 769x3 [border: (1px inset #000000)]
+layer at (13,470) size 20x20
+  RenderBlock (positioned) {DIV} at (13,469) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (43,470) size 20x20
+  RenderBlock (positioned) {DIV} at (43,469) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (73,470) size 20x20
+  RenderBlock (positioned) {DIV} at (73,469) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (103,470) size 20x20
+  RenderBlock (positioned) {DIV} at (103,469) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
     RenderBR {BR} at (6,6) size 0x18
     RenderBR {BR} at (6,24) size 0x18
     RenderBR {BR} at (6,42) size 0x18
-layer at (13,763) size 20x20
-  RenderImage {IMG} at (13,763) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (43,763) size 20x20
-  RenderImage {IMG} at (43,763) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (73,763) size 20x20
-  RenderImage {IMG} at (73,763) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
-layer at (103,763) size 20x20
-  RenderImage {IMG} at (103,763) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (13,807) size 20x20
+  RenderImage {IMG} at (13,807) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (43,807) size 20x20
+  RenderImage {IMG} at (43,807) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (73,807) size 20x20
+  RenderImage {IMG} at (73,807) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]
+layer at (103,807) size 20x20
+  RenderImage {IMG} at (103,807) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]

diff --git a/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.png b/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.png
index 9b64b7fee5848fe127e1eed907743f33931354f4..f717ea45dfee9b6f4c4df83fdf6c554bea0a2a40 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.png and b/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt b/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt
index 618131f412ef969e0866173db256f4f1fb77fd27..3ee613b72042b58f4675cce96732577dbe1beafc 100644 (file)
--- a/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt
@@ -31,14 +31,14 @@ layer at (0,0) size 800x600
         RenderTextControl {INPUT} at (176,2) size 137x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,147) size 784x18
-        RenderTextControl {INPUT} at (2,2) size 167x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderTextControl {INPUT} at (2,0) size 167x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,0) size 161x12
             RenderBlock {DIV} at (0,0) size 17x12
             RenderBlock {DIV} at (17,3) size 131x6
             RenderBlock {DIV} at (147,0) size 14x12
         RenderText {#text} at (170,0) size 5x18
           text run at (170,0) width 5: " "
-        RenderTextControl {INPUT} at (176,2) size 137x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderTextControl {INPUT} at (176,0) size 137x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
 layer at (30,76) size 130x13
   RenderBlock {DIV} at (0,0) size 131x13
@@ -56,11 +56,11 @@ layer at (187,124) size 130x13
   RenderBlock {DIV} at (3,1) size 131x13
     RenderText {#text} at (0,0) size 23x13
       text run at (0,0) width 23: "Text"
-layer at (30,160) size 130x6 scrollHeight 13
+layer at (30,158) size 130x6 scrollHeight 13
   RenderBlock {DIV} at (0,0) size 131x6
     RenderText {#text} at (0,0) size 23x13
       text run at (0,0) width 23: "Text"
-layer at (187,160) size 130x6 scrollHeight 13
+layer at (187,158) size 130x6 scrollHeight 13
   RenderBlock {DIV} at (3,3) size 131x6
     RenderText {#text} at (0,0) size 23x13
       text run at (0,0) width 23: "Text"

diff --git a/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png b/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png
deleted file mode 100644 (file)
index 14ce185..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/mac/fast/multicol/client-rects-expected.png b/LayoutTests/platform/mac/fast/multicol/client-rects-expected.png
index 031480ac53968f448ad0de157dcccbe5072fc873..484fc0467a2d6fa855b8cc7400b860dc5e8d0eeb 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/multicol/client-rects-expected.png and b/LayoutTests/platform/mac/fast/multicol/client-rects-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt b/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt
index d8c6593c4d650edf30f6ac7e9c44871d2d569342..016defeb728d6936a7aec3c96d30118a8c2d5c18 100644 (file)
--- a/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt
@@ -17,46 +17,46 @@ layer at (0,0) size 800x600
         RenderBlock {SPAN} at (718,0) size 25x25 [border: (3px solid #0000FF7F)]
         RenderText {#text} at (743,11) size 4x18
           text run at (743,11) width 4: "."
-      RenderBlock (anonymous) at (0,45) size 784x330
-        RenderText {#text} at (116,72) size 4x18
-          text run at (116,72) width 4: " "
-        RenderText {#text} at (236,72) size 4x18
-          text run at (236,72) width 4: " "
-        RenderText {#text} at (356,72) size 4x18
-          text run at (356,72) width 4: " "
-        RenderText {#text} at (476,72) size 4x18
-          text run at (476,72) width 4: " "
-        RenderText {#text} at (596,72) size 4x18
-          text run at (596,72) width 4: " "
-        RenderText {#text} at (716,72) size 4x18
-          text run at (716,72) width 4: " "
-        RenderText {#text} at (116,192) size 4x18
-          text run at (116,192) width 4: " "
-        RenderText {#text} at (206,192) size 4x18
-          text run at (206,192) width 4: " "
-        RenderText {#text} at (296,192) size 4x18
-          text run at (296,192) width 4: " "
-        RenderText {#text} at (386,192) size 4x18
-          text run at (386,192) width 4: " "
-        RenderText {#text} at (476,192) size 4x18
-          text run at (476,192) width 4: " "
-        RenderText {#text} at (566,192) size 4x18
-          text run at (566,192) width 4: " "
-        RenderText {#text} at (656,192) size 4x18
-          text run at (656,192) width 4: " "
+      RenderBlock (anonymous) at (0,45) size 784x357
+        RenderText {#text} at (116,99) size 4x18
+          text run at (116,99) width 4: " "
+        RenderText {#text} at (236,99) size 4x18
+          text run at (236,99) width 4: " "
+        RenderText {#text} at (356,99) size 4x18
+          text run at (356,99) width 4: " "
+        RenderText {#text} at (476,99) size 4x18
+          text run at (476,99) width 4: " "
+        RenderText {#text} at (596,99) size 4x18
+          text run at (596,99) width 4: " "
+        RenderText {#text} at (716,99) size 4x18
+          text run at (716,99) width 4: " "
+        RenderText {#text} at (116,219) size 4x18
+          text run at (116,219) width 4: " "
+        RenderText {#text} at (206,219) size 4x18
+          text run at (206,219) width 4: " "
+        RenderText {#text} at (296,219) size 4x18
+          text run at (296,219) width 4: " "
+        RenderText {#text} at (386,219) size 4x18
+          text run at (386,219) width 4: " "
+        RenderText {#text} at (476,219) size 4x18
+          text run at (476,219) width 4: " "
+        RenderText {#text} at (566,219) size 4x18
+          text run at (566,219) width 4: " "
+        RenderText {#text} at (656,219) size 4x18
+          text run at (656,219) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (86,312) size 4x18
-          text run at (86,312) width 4: " "
-        RenderText {#text} at (176,312) size 4x18
-          text run at (176,312) width 4: " "
-        RenderText {#text} at (266,312) size 4x18
-          text run at (266,312) width 4: " "
-        RenderText {#text} at (356,312) size 4x18
-          text run at (356,312) width 4: " "
-        RenderText {#text} at (446,312) size 4x18
-          text run at (446,312) width 4: " "
-        RenderText {#text} at (536,312) size 4x18
-          text run at (536,312) width 4: " "
+        RenderText {#text} at (86,339) size 4x18
+          text run at (86,339) width 4: " "
+        RenderText {#text} at (176,339) size 4x18
+          text run at (176,339) width 4: " "
+        RenderText {#text} at (266,339) size 4x18
+          text run at (266,339) width 4: " "
+        RenderText {#text} at (356,339) size 4x18
+          text run at (356,339) width 4: " "
+        RenderText {#text} at (446,339) size 4x18
+          text run at (446,339) width 4: " "
+        RenderText {#text} at (536,339) size 4x18
+          text run at (536,339) width 4: " "
         RenderText {#text} at (0,0) size 0x0
 layer at (8,63) size 116x66
   RenderBlock {DIV} at (0,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
@@ -104,10 +104,10 @@ layer at (376,71) size 48x100
       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 (488,63) size 116x66
-  RenderBlock {DIV} at (480,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (488,81) size 116x66
+  RenderBlock {DIV} at (480,28) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x50
-layer at (496,71) size 48x79
+layer at (496,89) size 48x79
   RenderMultiColumnFlowThread at (8,8) size 48x79
     RenderBlock (anonymous) at (0,0) size 48x25
       RenderBR {BR} at (0,0) size 0x25
@@ -117,36 +117,36 @@ layer at (496,71) size 48x79
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (608,63) size 116x66
-  RenderBlock {DIV} at (600,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (608,83) size 116x66
+  RenderBlock {DIV} at (600,30) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x50
-layer at (616,71) size 48x75
+layer at (616,91) size 48x75
   RenderMultiColumnFlowThread at (8,8) size 48x75
     RenderBlock (anonymous) at (0,0) size 48x25
       RenderBR {BR} at (0,0) size 0x25
     RenderBlock {DIV} at (0,25) size 48x50
       RenderBR {BR} at (0,0) size 0x25
       RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
-layer at (8,183) size 116x66
-  RenderBlock {DIV} at (0,130) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (8,210) size 116x66
+  RenderBlock {DIV} at (0,157) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x50
-layer at (16,191) size 48x65
+layer at (16,218) size 48x65
   RenderMultiColumnFlowThread at (8,8) size 48x65
     RenderBlock {DIV} at (0,40) size 25x25 [bgcolor=#ADD8E6]
-layer at (138,143) size 66x116
-  RenderBlock {DIV} at (130,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (138,170) size 66x116
+  RenderBlock {DIV} at (130,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (146,151) size 100x48
+layer at (146,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderText {#text} at (25,0) size 75x25
       text run at (25,0) width 25: "x"
       text run at (50,0) width 25: "y"
       text run at (75,0) width 25: "z"
-layer at (228,143) size 66x116
-  RenderBlock {DIV} at (220,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (228,170) size 66x116
+  RenderBlock {DIV} at (220,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (236,151) size 100x48
+layer at (236,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderInline {SPAN} at (0,0) size 75x25
@@ -155,10 +155,10 @@ layer at (236,151) size 100x48
         text run at (50,0) width 25: "y"
         text run at (75,0) width 25: "z"
     RenderText {#text} at (0,0) size 0x0
-layer at (318,143) size 66x116
-  RenderBlock {DIV} at (310,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (318,170) size 66x116
+  RenderBlock {DIV} at (310,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (326,151) size 100x48
+layer at (326,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -167,10 +167,10 @@ layer at (326,151) size 100x48
         text run at (0,0) width 25: "x"
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (408,143) size 66x116
-  RenderBlock {DIV} at (400,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (408,170) size 66x116
+  RenderBlock {DIV} at (400,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (416,151) size 100x48
+layer at (416,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -179,10 +179,10 @@ layer at (416,151) size 100x48
       RenderText {#text} at (25,0) size 50x25
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (498,143) size 66x116
-  RenderBlock {DIV} at (490,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (498,170) size 66x116
+  RenderBlock {DIV} at (490,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (506,151) size 79x48
+layer at (506,178) size 79x48
   RenderMultiColumnFlowThread at (8,8) size 79x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -192,36 +192,36 @@ layer at (506,151) size 79x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (588,143) size 66x116
-  RenderBlock {DIV} at (580,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (588,170) size 66x116
+  RenderBlock {DIV} at (580,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (596,151) size 75x48
+layer at (596,178) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
     RenderBlock {DIV} at (25,0) size 50x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (678,143) size 66x116
-  RenderBlock {DIV} at (670,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (678,170) size 66x116
+  RenderBlock {DIV} at (670,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (686,151) size 65x48
+layer at (686,178) size 65x48
   RenderMultiColumnFlowThread at (8,8) size 65x48
     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (18,263) size 66x116
-  RenderBlock {DIV} at (10,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (18,290) size 66x116
+  RenderBlock {DIV} at (10,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (-24,271) size 100x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+layer at (-24,298) size 100x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderText {#text} at (25,0) size 75x25
       text run at (25,0) width 25: "x"
       text run at (50,0) width 25: "y"
       text run at (75,0) width 25: "z"
-layer at (108,263) size 66x116
-  RenderBlock {DIV} at (100,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (108,290) size 66x116
+  RenderBlock {DIV} at (100,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (66,271) size 100x48
+layer at (66,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderInline {SPAN} at (0,0) size 75x25
@@ -230,10 +230,10 @@ layer at (66,271) size 100x48
         text run at (50,0) width 25: "y"
         text run at (75,0) width 25: "z"
     RenderText {#text} at (0,0) size 0x0
-layer at (198,263) size 66x116
-  RenderBlock {DIV} at (190,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (198,290) size 66x116
+  RenderBlock {DIV} at (190,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (156,271) size 100x48
+layer at (156,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -242,10 +242,10 @@ layer at (156,271) size 100x48
         text run at (0,0) width 25: "x"
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (288,263) size 66x116
-  RenderBlock {DIV} at (280,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (288,290) size 66x116
+  RenderBlock {DIV} at (280,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (246,271) size 100x48
+layer at (246,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -254,10 +254,10 @@ layer at (246,271) size 100x48
       RenderText {#text} at (25,0) size 50x25
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (378,263) size 66x116
-  RenderBlock {DIV} at (370,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (378,290) size 66x116
+  RenderBlock {DIV} at (370,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (357,271) size 79x48
+layer at (357,298) size 79x48
   RenderMultiColumnFlowThread at (8,8) size 79x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -267,20 +267,20 @@ layer at (357,271) size 79x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (468,263) size 66x116
-  RenderBlock {DIV} at (460,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (468,290) size 66x116
+  RenderBlock {DIV} at (460,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (451,271) size 75x48
+layer at (451,298) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
     RenderBlock {DIV} at (25,0) size 50x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (558,263) size 66x116
-  RenderBlock {DIV} at (550,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (558,290) size 66x116
+  RenderBlock {DIV} at (550,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (551,271) size 65x48
+layer at (551,298) size 65x48
   RenderMultiColumnFlowThread at (8,8) size 65x48
     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
 layer at (16,96) size 25x25
@@ -305,65 +305,65 @@ layer at (428,71) size 26x25
   RenderBlock (positioned) {DIV} at (428,71) size 26x25 [border: (3px solid #0000FF7F)]
 layer at (428,96) size 26x25
   RenderBlock (positioned) {DIV} at (428,96) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (550,73) size 26x25
-  RenderBlock (positioned) {DIV} at (550,73) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (668,71) size 26x25
-  RenderBlock (positioned) {DIV} at (668,71) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (68,181) size 26x25
-  RenderBlock (positioned) {DIV} at (68,181) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (171,151) size 25x25
-  RenderBlock (positioned) {DIV} at (171,151) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (146,203) size 25x26
-  RenderBlock (positioned) {DIV} at (146,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (171,203) size 25x26
-  RenderBlock (positioned) {DIV} at (171,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (261,151) size 25x25
-  RenderBlock (positioned) {DIV} at (261,151) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (236,203) size 25x26
-  RenderBlock (positioned) {DIV} at (236,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (261,203) size 25x26
-  RenderBlock (positioned) {DIV} at (261,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (351,151) size 25x25
-  RenderBlock (positioned) {DIV} at (351,151) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (326,203) size 25x26
-  RenderBlock (positioned) {DIV} at (326,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (351,203) size 25x26
-  RenderBlock (positioned) {DIV} at (351,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (416,203) size 25x26
-  RenderBlock (positioned) {DIV} at (416,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (441,203) size 25x26
-  RenderBlock (positioned) {DIV} at (441,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (508,205) size 25x26
-  RenderBlock (positioned) {DIV} at (508,205) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (596,203) size 25x26
-  RenderBlock (positioned) {DIV} at (596,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (676,203) size 25x26
-  RenderBlock (positioned) {DIV} at (676,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (26,271) size 25x25
-  RenderBlock (positioned) {DIV} at (26,271) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (51,323) size 25x26
-  RenderBlock (positioned) {DIV} at (51,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (26,323) size 25x26
-  RenderBlock (positioned) {DIV} at (26,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (116,271) size 25x25
-  RenderBlock (positioned) {DIV} at (116,271) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (141,323) size 25x26
-  RenderBlock (positioned) {DIV} at (141,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (116,323) size 25x26
-  RenderBlock (positioned) {DIV} at (116,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (206,271) size 25x25
-  RenderBlock (positioned) {DIV} at (206,271) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (231,323) size 25x26
-  RenderBlock (positioned) {DIV} at (231,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (206,323) size 25x26
-  RenderBlock (positioned) {DIV} at (206,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (321,323) size 25x26
-  RenderBlock (positioned) {DIV} at (321,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (296,323) size 25x26
-  RenderBlock (positioned) {DIV} at (296,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (409,325) size 25x26
-  RenderBlock (positioned) {DIV} at (409,325) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (501,323) size 25x26
-  RenderBlock (positioned) {DIV} at (501,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (601,323) size 25x26
-  RenderBlock (positioned) {DIV} at (601,323) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (550,91) size 26x25
+  RenderBlock (positioned) {DIV} at (550,91) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (668,91) size 26x25
+  RenderBlock (positioned) {DIV} at (668,91) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (68,208) size 26x25
+  RenderBlock (positioned) {DIV} at (68,208) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (171,178) size 25x25
+  RenderBlock (positioned) {DIV} at (171,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (146,230) size 25x26
+  RenderBlock (positioned) {DIV} at (146,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (171,230) size 25x26
+  RenderBlock (positioned) {DIV} at (171,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (261,178) size 25x25
+  RenderBlock (positioned) {DIV} at (261,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (236,230) size 25x26
+  RenderBlock (positioned) {DIV} at (236,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (261,230) size 25x26
+  RenderBlock (positioned) {DIV} at (261,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (351,178) size 25x25
+  RenderBlock (positioned) {DIV} at (351,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (326,230) size 25x26
+  RenderBlock (positioned) {DIV} at (326,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (351,230) size 25x26
+  RenderBlock (positioned) {DIV} at (351,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (416,230) size 25x26
+  RenderBlock (positioned) {DIV} at (416,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (441,230) size 25x26
+  RenderBlock (positioned) {DIV} at (441,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (508,232) size 25x26
+  RenderBlock (positioned) {DIV} at (508,232) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (596,230) size 25x26
+  RenderBlock (positioned) {DIV} at (596,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (676,230) size 25x26
+  RenderBlock (positioned) {DIV} at (676,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (26,298) size 25x25
+  RenderBlock (positioned) {DIV} at (26,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (51,350) size 25x26
+  RenderBlock (positioned) {DIV} at (51,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (26,350) size 25x26
+  RenderBlock (positioned) {DIV} at (26,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (116,298) size 25x25
+  RenderBlock (positioned) {DIV} at (116,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (141,350) size 25x26
+  RenderBlock (positioned) {DIV} at (141,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (116,350) size 25x26
+  RenderBlock (positioned) {DIV} at (116,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (206,298) size 25x25
+  RenderBlock (positioned) {DIV} at (206,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (231,350) size 25x26
+  RenderBlock (positioned) {DIV} at (231,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (206,350) size 25x26
+  RenderBlock (positioned) {DIV} at (206,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (321,350) size 25x26
+  RenderBlock (positioned) {DIV} at (321,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (296,350) size 25x26
+  RenderBlock (positioned) {DIV} at (296,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (409,352) size 25x26
+  RenderBlock (positioned) {DIV} at (409,352) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (501,350) size 25x26
+  RenderBlock (positioned) {DIV} at (501,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (601,350) size 25x26
+  RenderBlock (positioned) {DIV} at (601,350) size 25x26 [border: (3px solid #0000FF7F)]

diff --git a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.png b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.png
index 4dccfc53ec0abefe4198f198c0f4c64be63b1ca2..34d9ff27a257d19493da661236f8510a493794e1 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.png and b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt
index d79f55605f85d44cf097aa047660864cd081c9cf..68db649e7886d83a0d2e6a18f0a0386d691ad168 100644 (file)
--- a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-complex-expected.txt
@@ -17,45 +17,45 @@ layer at (0,0) size 800x600
         RenderBlock {SPAN} at (718,0) size 25x25 [border: (3px solid #0000FF7F)]
         RenderText {#text} at (743,11) size 4x18
           text run at (743,11) width 4: "."
-      RenderBlock (anonymous) at (0,45) size 784x514
-        RenderText {#text} at (116,112) size 4x18
-          text run at (116,112) width 4: " "
-        RenderText {#text} at (236,112) size 4x18
-          text run at (236,112) width 4: " "
-        RenderText {#text} at (356,112) size 4x18
-          text run at (356,112) width 4: " "
-        RenderText {#text} at (476,112) size 4x18
-          text run at (476,112) width 4: " "
-        RenderText {#text} at (596,112) size 4x18
-          text run at (596,112) width 4: " "
-        RenderText {#text} at (716,112) size 4x18
-          text run at (716,112) width 4: " "
-        RenderText {#text} at (116,256) size 4x18
-          text run at (116,256) width 4: " "
-        RenderText {#text} at (246,256) size 4x18
-          text run at (246,256) width 4: " "
-        RenderText {#text} at (376,256) size 4x18
-          text run at (376,256) width 4: " "
-        RenderText {#text} at (506,256) size 4x18
-          text run at (506,256) width 4: " "
-        RenderText {#text} at (636,256) size 4x18
-          text run at (636,256) width 4: " "
+      RenderBlock (anonymous) at (0,45) size 784x516
+        RenderText {#text} at (116,114) size 4x18
+          text run at (116,114) width 4: " "
+        RenderText {#text} at (236,114) size 4x18
+          text run at (236,114) width 4: " "
+        RenderText {#text} at (356,114) size 4x18
+          text run at (356,114) width 4: " "
+        RenderText {#text} at (476,114) size 4x18
+          text run at (476,114) width 4: " "
+        RenderText {#text} at (596,114) size 4x18
+          text run at (596,114) width 4: " "
+        RenderText {#text} at (716,114) size 4x18
+          text run at (716,114) width 4: " "
+        RenderText {#text} at (116,258) size 4x18
+          text run at (116,258) width 4: " "
+        RenderText {#text} at (246,258) size 4x18
+          text run at (246,258) width 4: " "
+        RenderText {#text} at (376,258) size 4x18
+          text run at (376,258) width 4: " "
+        RenderText {#text} at (506,258) size 4x18
+          text run at (506,258) width 4: " "
+        RenderText {#text} at (636,258) size 4x18
+          text run at (636,258) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (126,376) size 4x18
-          text run at (126,376) width 4: " "
-        RenderText {#text} at (256,376) size 4x18
-          text run at (256,376) width 4: " "
-        RenderText {#text} at (386,376) size 4x18
-          text run at (386,376) width 4: " "
-        RenderText {#text} at (516,376) size 4x18
-          text run at (516,376) width 4: " "
-        RenderText {#text} at (646,376) size 4x18
-          text run at (646,376) width 4: " "
+        RenderText {#text} at (126,378) size 4x18
+          text run at (126,378) width 4: " "
+        RenderText {#text} at (256,378) size 4x18
+          text run at (256,378) width 4: " "
+        RenderText {#text} at (386,378) size 4x18
+          text run at (386,378) width 4: " "
+        RenderText {#text} at (516,378) size 4x18
+          text run at (516,378) width 4: " "
+        RenderText {#text} at (646,378) size 4x18
+          text run at (646,378) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (126,496) size 4x18
-          text run at (126,496) width 4: " "
-        RenderText {#text} at (256,496) size 4x18
-          text run at (256,496) width 4: " "
+        RenderText {#text} at (126,498) size 4x18
+          text run at (126,498) width 4: " "
+        RenderText {#text} at (256,498) size 4x18
+          text run at (256,498) width 4: " "
         RenderText {#text} at (0,0) size 0x0
 layer at (8,63) size 116x106
   RenderBlock {DIV} at (0,10) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
@@ -121,12 +121,12 @@ layer at (376,71) size 48x115
       RenderText {#text} at (0,30) size 25x50
         text run at (0,30) width 25: "y"
         text run at (0,55) width 25: "z"
-layer at (488,63) size 116x106
-  RenderBlock {DIV} at (480,10) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (488,81) size 116x106
+  RenderBlock {DIV} at (480,28) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x5
     RenderBlock {DIV} at (8,13) size 100x30 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (8,43) size 100x55
-layer at (496,71) size 48x94
+layer at (496,89) size 48x94
   RenderMultiColumnFlowThread at (8,8) size 48x94
     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0
@@ -138,12 +138,12 @@ layer at (496,71) size 48x94
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (608,81) size 116x106
-  RenderBlock {DIV} at (600,28) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (608,83) size 116x106
+  RenderBlock {DIV} at (600,30) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x5
     RenderBlock {DIV} at (8,13) size 100x30 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (8,43) size 100x55
-layer at (616,89) size 48x90
+layer at (616,91) size 48x90
   RenderMultiColumnFlowThread at (8,8) size 48x90
     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0
@@ -152,22 +152,22 @@ layer at (616,89) size 48x90
     RenderBlock {DIV} at (0,35) size 48x55
       RenderBR {BR} at (0,0) size 0x25
       RenderImage {IMG} at (0,30) size 25x25 [bgcolor=#ADD8E6]
-layer at (8,207) size 116x106
-  RenderBlock {DIV} at (0,154) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (8,209) size 116x106
+  RenderBlock {DIV} at (0,156) size 116x106 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x5
     RenderBlock {DIV} at (8,13) size 100x30 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (8,43) size 100x55
-layer at (16,215) size 48x75
+layer at (16,217) size 48x75
   RenderMultiColumnFlowThread at (8,8) size 48x75
     RenderBlock {DIV} at (0,0) size 48x10 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (0,10) size 0x0
     RenderBlock {DIV} at (0,50) size 25x25 [bgcolor=#ADD8E6]
-layer at (138,207) size 106x116
-  RenderBlock {DIV} at (130,154) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (138,209) size 106x116
+  RenderBlock {DIV} at (130,156) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (146,215) size 115x48
+layer at (146,217) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -177,12 +177,12 @@ layer at (146,215) size 115x48
         text run at (25,0) width 25: "x"
         text run at (55,0) width 25: "y"
         text run at (80,0) width 25: "z"
-layer at (268,207) size 106x116
-  RenderBlock {DIV} at (260,154) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (268,209) size 106x116
+  RenderBlock {DIV} at (260,156) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (276,215) size 115x48
+layer at (276,217) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -194,12 +194,12 @@ layer at (276,215) size 115x48
           text run at (55,0) width 25: "y"
           text run at (80,0) width 25: "z"
       RenderText {#text} at (0,0) size 0x0
-layer at (398,207) size 106x116
-  RenderBlock {DIV} at (390,154) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (398,209) size 106x116
+  RenderBlock {DIV} at (390,156) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (406,215) size 115x48
+layer at (406,217) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -210,12 +210,12 @@ layer at (406,215) size 115x48
         text run at (0,0) width 25: "x"
         text run at (30,0) width 25: "y"
         text run at (55,0) width 25: "z"
-layer at (528,207) size 106x116
-  RenderBlock {DIV} at (520,154) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (528,209) size 106x116
+  RenderBlock {DIV} at (520,156) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (536,215) size 115x48
+layer at (536,217) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -226,12 +226,12 @@ layer at (536,215) size 115x48
       RenderText {#text} at (30,0) size 50x25
         text run at (30,0) width 25: "y"
         text run at (55,0) width 25: "z"
-layer at (658,207) size 106x116
-  RenderBlock {DIV} at (650,154) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (658,209) size 106x116
+  RenderBlock {DIV} at (650,156) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (666,215) size 94x48
+layer at (666,217) size 94x48
   RenderMultiColumnFlowThread at (8,8) size 94x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -243,12 +243,12 @@ layer at (666,215) size 94x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (18,327) size 106x116
-  RenderBlock {DIV} at (10,274) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (18,329) size 106x116
+  RenderBlock {DIV} at (10,276) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (26,335) size 90x48
+layer at (26,337) size 90x48
   RenderMultiColumnFlowThread at (8,8) size 90x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -257,22 +257,22 @@ layer at (26,335) size 90x48
     RenderBlock {DIV} at (35,0) size 55x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (30,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (148,327) size 106x116
-  RenderBlock {DIV} at (140,274) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (148,329) size 106x116
+  RenderBlock {DIV} at (140,276) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (156,335) size 75x48
+layer at (156,337) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
     RenderBlock {DIV} at (50,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (278,327) size 106x116
-  RenderBlock {DIV} at (270,274) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (278,329) size 106x116
+  RenderBlock {DIV} at (270,276) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (261,335) size 115x48
+layer at (261,337) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -282,12 +282,12 @@ layer at (261,335) size 115x48
         text run at (25,0) width 25: "x"
         text run at (55,0) width 25: "y"
         text run at (80,0) width 25: "z"
-layer at (408,327) size 106x116
-  RenderBlock {DIV} at (400,274) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (408,329) size 106x116
+  RenderBlock {DIV} at (400,276) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (391,335) size 115x48
+layer at (391,337) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -299,12 +299,12 @@ layer at (391,335) size 115x48
           text run at (55,0) width 25: "y"
           text run at (80,0) width 25: "z"
       RenderText {#text} at (0,0) size 0x0
-layer at (538,327) size 106x116
-  RenderBlock {DIV} at (530,274) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (538,329) size 106x116
+  RenderBlock {DIV} at (530,276) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (521,335) size 115x48
+layer at (521,337) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -315,12 +315,12 @@ layer at (521,335) size 115x48
         text run at (0,0) width 25: "x"
         text run at (30,0) width 25: "y"
         text run at (55,0) width 25: "z"
-layer at (668,327) size 106x116
-  RenderBlock {DIV} at (660,274) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (668,329) size 106x116
+  RenderBlock {DIV} at (660,276) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (651,335) size 115x48
+layer at (651,337) size 115x48
   RenderMultiColumnFlowThread at (8,8) size 115x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -331,12 +331,12 @@ layer at (651,335) size 115x48
       RenderText {#text} at (30,0) size 50x25
         text run at (30,0) width 25: "y"
         text run at (55,0) width 25: "z"
-layer at (18,447) size 106x116
-  RenderBlock {DIV} at (10,394) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (18,449) size 106x116
+  RenderBlock {DIV} at (10,396) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (22,455) size 94x48
+layer at (22,457) size 94x48
   RenderMultiColumnFlowThread at (8,8) size 94x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -348,12 +348,12 @@ layer at (22,455) size 94x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (148,447) size 106x116
-  RenderBlock {DIV} at (140,394) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (148,449) size 106x116
+  RenderBlock {DIV} at (140,396) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (156,455) size 90x48
+layer at (156,457) size 90x48
   RenderMultiColumnFlowThread at (8,8) size 90x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -362,12 +362,12 @@ layer at (156,455) size 90x48
     RenderBlock {DIV} at (35,0) size 55x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (30,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (278,447) size 106x116
-  RenderBlock {DIV} at (270,394) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (278,449) size 106x116
+  RenderBlock {DIV} at (270,396) size 106x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 5x100
     RenderBlock {DIV} at (13,8) size 30x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (43,8) size 55x100
-layer at (301,455) size 75x48
+layer at (301,457) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderBlock {DIV} at (0,0) size 10x48 [bgcolor=#000080]
     RenderMultiColumnSpannerPlaceholder at (10,0) size 0x0
@@ -394,65 +394,65 @@ layer at (428,106) size 26x25
   RenderBlock (positioned) {DIV} at (428,106) size 26x25 [border: (3px solid #0000FF7F)]
 layer at (428,131) size 26x25
   RenderBlock (positioned) {DIV} at (428,131) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (550,108) size 26x25
-  RenderBlock (positioned) {DIV} at (550,108) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (668,124) size 26x25
-  RenderBlock (positioned) {DIV} at (668,124) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (16,290) size 25x25
-  RenderBlock (positioned) {DIV} at (16,290) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (206,215) size 25x25
-  RenderBlock (positioned) {DIV} at (206,215) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (181,267) size 25x26
-  RenderBlock (positioned) {DIV} at (181,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (206,267) size 25x26
-  RenderBlock (positioned) {DIV} at (206,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (336,215) size 25x25
-  RenderBlock (positioned) {DIV} at (336,215) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (311,267) size 25x26
-  RenderBlock (positioned) {DIV} at (311,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (336,267) size 25x26
-  RenderBlock (positioned) {DIV} at (336,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (466,215) size 25x25
-  RenderBlock (positioned) {DIV} at (466,215) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (441,267) size 25x26
-  RenderBlock (positioned) {DIV} at (441,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (466,267) size 25x26
-  RenderBlock (positioned) {DIV} at (466,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (571,267) size 25x26
-  RenderBlock (positioned) {DIV} at (571,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (596,267) size 25x26
-  RenderBlock (positioned) {DIV} at (596,267) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (703,269) size 25x26
-  RenderBlock (positioned) {DIV} at (703,269) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (61,387) size 25x26
-  RenderBlock (positioned) {DIV} at (61,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (231,335) size 25x25
-  RenderBlock (positioned) {DIV} at (231,335) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (291,335) size 25x25
-  RenderBlock (positioned) {DIV} at (291,335) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (316,387) size 25x26
-  RenderBlock (positioned) {DIV} at (316,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (291,387) size 25x26
-  RenderBlock (positioned) {DIV} at (291,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (421,335) size 25x25
-  RenderBlock (positioned) {DIV} at (421,335) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (446,387) size 25x26
-  RenderBlock (positioned) {DIV} at (446,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (421,387) size 25x26
-  RenderBlock (positioned) {DIV} at (421,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (551,335) size 25x25
-  RenderBlock (positioned) {DIV} at (551,335) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (576,387) size 25x26
-  RenderBlock (positioned) {DIV} at (576,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (551,387) size 25x26
-  RenderBlock (positioned) {DIV} at (551,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (706,387) size 25x26
-  RenderBlock (positioned) {DIV} at (706,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (681,387) size 25x26
-  RenderBlock (positioned) {DIV} at (681,387) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (54,509) size 25x26
-  RenderBlock (positioned) {DIV} at (54,509) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (186,507) size 25x26
-  RenderBlock (positioned) {DIV} at (186,507) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (276,455) size 25x25
-  RenderBlock (positioned) {DIV} at (276,455) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (550,126) size 26x25
+  RenderBlock (positioned) {DIV} at (550,126) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (668,126) size 26x25
+  RenderBlock (positioned) {DIV} at (668,126) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (16,292) size 25x25
+  RenderBlock (positioned) {DIV} at (16,292) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (206,217) size 25x25
+  RenderBlock (positioned) {DIV} at (206,217) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (181,269) size 25x26
+  RenderBlock (positioned) {DIV} at (181,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (206,269) size 25x26
+  RenderBlock (positioned) {DIV} at (206,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (336,217) size 25x25
+  RenderBlock (positioned) {DIV} at (336,217) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (311,269) size 25x26
+  RenderBlock (positioned) {DIV} at (311,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (336,269) size 25x26
+  RenderBlock (positioned) {DIV} at (336,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (466,217) size 25x25
+  RenderBlock (positioned) {DIV} at (466,217) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (441,269) size 25x26
+  RenderBlock (positioned) {DIV} at (441,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (466,269) size 25x26
+  RenderBlock (positioned) {DIV} at (466,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (571,269) size 25x26
+  RenderBlock (positioned) {DIV} at (571,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (596,269) size 25x26
+  RenderBlock (positioned) {DIV} at (596,269) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (703,271) size 25x26
+  RenderBlock (positioned) {DIV} at (703,271) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (61,389) size 25x26
+  RenderBlock (positioned) {DIV} at (61,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (231,337) size 25x25
+  RenderBlock (positioned) {DIV} at (231,337) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (291,337) size 25x25
+  RenderBlock (positioned) {DIV} at (291,337) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (316,389) size 25x26
+  RenderBlock (positioned) {DIV} at (316,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (291,389) size 25x26
+  RenderBlock (positioned) {DIV} at (291,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (421,337) size 25x25
+  RenderBlock (positioned) {DIV} at (421,337) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (446,389) size 25x26
+  RenderBlock (positioned) {DIV} at (446,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (421,389) size 25x26
+  RenderBlock (positioned) {DIV} at (421,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (551,337) size 25x25
+  RenderBlock (positioned) {DIV} at (551,337) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (576,389) size 25x26
+  RenderBlock (positioned) {DIV} at (576,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (551,389) size 25x26
+  RenderBlock (positioned) {DIV} at (551,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (706,389) size 25x26
+  RenderBlock (positioned) {DIV} at (706,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (681,389) size 25x26
+  RenderBlock (positioned) {DIV} at (681,389) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (54,511) size 25x26
+  RenderBlock (positioned) {DIV} at (54,511) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (186,509) size 25x26
+  RenderBlock (positioned) {DIV} at (186,509) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (276,457) size 25x25
+  RenderBlock (positioned) {DIV} at (276,457) size 25x25 [border: (3px solid #0000FF7F)]

diff --git a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.png b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.png
index 0995c286383a520f31a45c8f261b7d3b0a0be1b1..c700fefdd0918c6df1f89c1cef1ab7cae1b506e1 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.png and b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt
index 82666e53ff6ec4313e4d81f7791c127cf1241f50..ed809026288769e1ad18265088e141f43e6dff08 100644 (file)
--- a/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/client-rects-spanners-expected.txt
@@ -17,47 +17,47 @@ layer at (0,0) size 800x600
         RenderBlock {SPAN} at (718,0) size 25x25 [border: (3px solid #0000FF7F)]
         RenderText {#text} at (743,11) size 4x18
           text run at (743,11) width 4: "."
-      RenderBlock (anonymous) at (0,45) size 784x456
-        RenderText {#text} at (116,82) size 4x18
-          text run at (116,82) width 4: " "
-        RenderText {#text} at (236,82) size 4x18
-          text run at (236,82) width 4: " "
-        RenderText {#text} at (356,82) size 4x18
-          text run at (356,82) width 4: " "
-        RenderText {#text} at (476,82) size 4x18
-          text run at (476,82) width 4: " "
-        RenderText {#text} at (596,82) size 4x18
-          text run at (596,82) width 4: " "
-        RenderText {#text} at (716,82) size 4x18
-          text run at (716,82) width 4: " "
-        RenderText {#text} at (116,202) size 4x18
-          text run at (116,202) width 4: " "
-        RenderText {#text} at (216,202) size 4x18
-          text run at (216,202) width 4: " "
-        RenderText {#text} at (316,202) size 4x18
-          text run at (316,202) width 4: " "
-        RenderText {#text} at (416,202) size 4x18
-          text run at (416,202) width 4: " "
-        RenderText {#text} at (516,202) size 4x18
-          text run at (516,202) width 4: " "
-        RenderText {#text} at (616,202) size 4x18
-          text run at (616,202) width 4: " "
-        RenderText {#text} at (716,202) size 4x18
-          text run at (716,202) width 4: " "
-        RenderText {#text} at (96,322) size 4x18
-          text run at (96,322) width 4: " "
-        RenderText {#text} at (196,322) size 4x18
-          text run at (196,322) width 4: " "
-        RenderText {#text} at (296,322) size 4x18
-          text run at (296,322) width 4: " "
-        RenderText {#text} at (396,322) size 4x18
-          text run at (396,322) width 4: " "
-        RenderText {#text} at (496,322) size 4x18
-          text run at (496,322) width 4: " "
-        RenderText {#text} at (596,322) size 4x18
-          text run at (596,322) width 4: " "
-        RenderText {#text} at (696,322) size 4x18
-          text run at (696,322) width 4: " "
+      RenderBlock (anonymous) at (0,45) size 784x473
+        RenderText {#text} at (116,99) size 4x18
+          text run at (116,99) width 4: " "
+        RenderText {#text} at (236,99) size 4x18
+          text run at (236,99) width 4: " "
+        RenderText {#text} at (356,99) size 4x18
+          text run at (356,99) width 4: " "
+        RenderText {#text} at (476,99) size 4x18
+          text run at (476,99) width 4: " "
+        RenderText {#text} at (596,99) size 4x18
+          text run at (596,99) width 4: " "
+        RenderText {#text} at (716,99) size 4x18
+          text run at (716,99) width 4: " "
+        RenderText {#text} at (116,219) size 4x18
+          text run at (116,219) width 4: " "
+        RenderText {#text} at (216,219) size 4x18
+          text run at (216,219) width 4: " "
+        RenderText {#text} at (316,219) size 4x18
+          text run at (316,219) width 4: " "
+        RenderText {#text} at (416,219) size 4x18
+          text run at (416,219) width 4: " "
+        RenderText {#text} at (516,219) size 4x18
+          text run at (516,219) width 4: " "
+        RenderText {#text} at (616,219) size 4x18
+          text run at (616,219) width 4: " "
+        RenderText {#text} at (716,219) size 4x18
+          text run at (716,219) width 4: " "
+        RenderText {#text} at (96,339) size 4x18
+          text run at (96,339) width 4: " "
+        RenderText {#text} at (196,339) size 4x18
+          text run at (196,339) width 4: " "
+        RenderText {#text} at (296,339) size 4x18
+          text run at (296,339) width 4: " "
+        RenderText {#text} at (396,339) size 4x18
+          text run at (396,339) width 4: " "
+        RenderText {#text} at (496,339) size 4x18
+          text run at (496,339) width 4: " "
+        RenderText {#text} at (596,339) size 4x18
+          text run at (596,339) width 4: " "
+        RenderText {#text} at (696,339) size 4x18
+          text run at (696,339) width 4: " "
         RenderText {#text} at (0,0) size 0x0
 layer at (8,63) size 116x76
   RenderBlock {DIV} at (0,10) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
@@ -115,11 +115,11 @@ layer at (376,71) size 48x100
       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 (488,63) size 116x76
-  RenderBlock {DIV} at (480,10) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (488,81) size 116x76
+  RenderBlock {DIV} at (480,28) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 100x10 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (8,18) size 100x50
-layer at (496,71) size 48x79
+layer at (496,89) size 48x79
   RenderMultiColumnFlowThread at (8,8) size 48x79
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 48x25
@@ -130,11 +130,11 @@ layer at (496,71) size 48x79
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (608,63) size 116x76
-  RenderBlock {DIV} at (600,10) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (608,83) size 116x76
+  RenderBlock {DIV} at (600,30) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 100x10 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (8,18) size 100x50
-layer at (616,71) size 48x75
+layer at (616,91) size 48x75
   RenderMultiColumnFlowThread at (8,8) size 48x75
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 48x25
@@ -142,19 +142,19 @@ layer at (616,71) size 48x75
     RenderBlock {DIV} at (0,25) size 48x50
       RenderBR {BR} at (0,0) size 0x25
       RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
-layer at (8,183) size 116x76
-  RenderBlock {DIV} at (0,130) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (8,200) size 116x76
+  RenderBlock {DIV} at (0,147) size 116x76 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 100x10 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (8,18) size 100x50
-layer at (16,191) size 48x65
+layer at (16,208) size 48x65
   RenderMultiColumnFlowThread at (8,8) size 48x65
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock {DIV} at (0,40) size 25x25 [bgcolor=#ADD8E6]
-layer at (138,153) size 76x116
-  RenderBlock {DIV} at (130,100) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (138,170) size 76x116
+  RenderBlock {DIV} at (130,117) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (146,161) size 100x48
+layer at (146,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 100x48
@@ -163,11 +163,11 @@ layer at (146,161) size 100x48
         text run at (25,0) width 25: "x"
         text run at (50,0) width 25: "y"
         text run at (75,0) width 25: "z"
-layer at (238,153) size 76x116
-  RenderBlock {DIV} at (230,100) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (238,170) size 76x116
+  RenderBlock {DIV} at (230,117) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (246,161) size 100x48
+layer at (246,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 100x48
@@ -178,11 +178,11 @@ layer at (246,161) size 100x48
           text run at (50,0) width 25: "y"
           text run at (75,0) width 25: "z"
       RenderText {#text} at (0,0) size 0x0
-layer at (338,153) size 76x116
-  RenderBlock {DIV} at (330,100) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (338,170) size 76x116
+  RenderBlock {DIV} at (330,117) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (346,161) size 100x48
+layer at (346,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -192,11 +192,11 @@ layer at (346,161) size 100x48
         text run at (0,0) width 25: "x"
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (438,153) size 76x116
-  RenderBlock {DIV} at (430,100) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (438,170) size 76x116
+  RenderBlock {DIV} at (430,117) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (446,161) size 100x48
+layer at (446,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -206,11 +206,11 @@ layer at (446,161) size 100x48
       RenderText {#text} at (25,0) size 50x25
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (538,153) size 76x116
-  RenderBlock {DIV} at (530,100) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (538,170) size 76x116
+  RenderBlock {DIV} at (530,117) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (546,161) size 79x48
+layer at (546,178) size 79x48
   RenderMultiColumnFlowThread at (8,8) size 79x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -221,11 +221,11 @@ layer at (546,161) size 79x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (638,153) size 76x116
-  RenderBlock {DIV} at (630,100) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (638,170) size 76x116
+  RenderBlock {DIV} at (630,117) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (646,161) size 75x48
+layer at (646,178) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -233,19 +233,19 @@ layer at (646,161) size 75x48
     RenderBlock {DIV} at (25,0) size 50x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (18,273) size 76x116
-  RenderBlock {DIV} at (10,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (18,290) size 76x116
+  RenderBlock {DIV} at (10,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (26,281) size 65x48
+layer at (26,298) size 65x48
   RenderMultiColumnFlowThread at (8,8) size 65x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (118,273) size 76x116
-  RenderBlock {DIV} at (110,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (118,290) size 76x116
+  RenderBlock {DIV} at (110,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (86,281) size 100x48
+layer at (86,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 100x48
@@ -254,11 +254,11 @@ layer at (86,281) size 100x48
         text run at (25,0) width 25: "x"
         text run at (50,0) width 25: "y"
         text run at (75,0) width 25: "z"
-layer at (218,273) size 76x116
-  RenderBlock {DIV} at (210,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (218,290) size 76x116
+  RenderBlock {DIV} at (210,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (186,281) size 100x48
+layer at (186,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 100x48
@@ -269,11 +269,11 @@ layer at (186,281) size 100x48
           text run at (50,0) width 25: "y"
           text run at (75,0) width 25: "z"
       RenderText {#text} at (0,0) size 0x0
-layer at (318,273) size 76x116
-  RenderBlock {DIV} at (310,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (318,290) size 76x116
+  RenderBlock {DIV} at (310,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (286,281) size 100x48
+layer at (286,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -283,11 +283,11 @@ layer at (286,281) size 100x48
         text run at (0,0) width 25: "x"
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (418,273) size 76x116
-  RenderBlock {DIV} at (410,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (418,290) size 76x116
+  RenderBlock {DIV} at (410,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (386,281) size 100x48
+layer at (386,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -297,11 +297,11 @@ layer at (386,281) size 100x48
       RenderText {#text} at (25,0) size 50x25
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (518,273) size 76x116
-  RenderBlock {DIV} at (510,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (518,290) size 76x116
+  RenderBlock {DIV} at (510,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (507,281) size 79x48
+layer at (507,298) size 79x48
   RenderMultiColumnFlowThread at (8,8) size 79x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -312,11 +312,11 @@ layer at (507,281) size 79x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (618,273) size 76x116
-  RenderBlock {DIV} at (610,220) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (618,290) size 76x116
+  RenderBlock {DIV} at (610,237) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (611,281) size 75x48
+layer at (611,298) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock (anonymous) at (0,0) size 25x48
@@ -324,11 +324,11 @@ layer at (611,281) size 75x48
     RenderBlock {DIV} at (25,0) size 50x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (18,393) size 76x116
-  RenderBlock {DIV} at (10,340) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (18,410) size 76x116
+  RenderBlock {DIV} at (10,357) size 76x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderBlock {DIV} at (8,8) size 10x100 [bgcolor=#C0C0C0]
     RenderMultiColumnSet at (18,8) size 50x100
-layer at (21,401) size 65x48
+layer at (21,418) size 65x48
   RenderMultiColumnFlowThread at (8,8) size 65x48
     RenderMultiColumnSpannerPlaceholder at (0,0) size 0x0
     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
@@ -354,65 +354,65 @@ layer at (428,81) size 26x25
   RenderBlock (positioned) {DIV} at (428,81) size 26x25 [border: (3px solid #0000FF7F)]
 layer at (428,106) size 26x25
   RenderBlock (positioned) {DIV} at (428,106) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (550,83) size 26x25
-  RenderBlock (positioned) {DIV} at (550,83) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (668,81) size 26x25
-  RenderBlock (positioned) {DIV} at (668,81) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (68,191) size 26x25
-  RenderBlock (positioned) {DIV} at (68,191) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (181,161) size 25x25
-  RenderBlock (positioned) {DIV} at (181,161) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (156,213) size 25x26
-  RenderBlock (positioned) {DIV} at (156,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (181,213) size 25x26
-  RenderBlock (positioned) {DIV} at (181,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (281,161) size 25x25
-  RenderBlock (positioned) {DIV} at (281,161) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (256,213) size 25x26
-  RenderBlock (positioned) {DIV} at (256,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (281,213) size 25x26
-  RenderBlock (positioned) {DIV} at (281,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (381,161) size 25x25
-  RenderBlock (positioned) {DIV} at (381,161) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (356,213) size 25x26
-  RenderBlock (positioned) {DIV} at (356,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (381,213) size 25x26
-  RenderBlock (positioned) {DIV} at (381,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (456,213) size 25x26
-  RenderBlock (positioned) {DIV} at (456,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (481,213) size 25x26
-  RenderBlock (positioned) {DIV} at (481,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (558,215) size 25x26
-  RenderBlock (positioned) {DIV} at (558,215) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (656,213) size 25x26
-  RenderBlock (positioned) {DIV} at (656,213) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (26,333) size 25x26
-  RenderBlock (positioned) {DIV} at (26,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (126,281) size 25x25
-  RenderBlock (positioned) {DIV} at (126,281) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (151,333) size 25x26
-  RenderBlock (positioned) {DIV} at (151,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (126,333) size 25x26
-  RenderBlock (positioned) {DIV} at (126,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (226,281) size 25x25
-  RenderBlock (positioned) {DIV} at (226,281) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (251,333) size 25x26
-  RenderBlock (positioned) {DIV} at (251,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (226,333) size 25x26
-  RenderBlock (positioned) {DIV} at (226,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (326,281) size 25x25
-  RenderBlock (positioned) {DIV} at (326,281) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (351,333) size 25x26
-  RenderBlock (positioned) {DIV} at (351,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (326,333) size 25x26
-  RenderBlock (positioned) {DIV} at (326,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (451,333) size 25x26
-  RenderBlock (positioned) {DIV} at (451,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (426,333) size 25x26
-  RenderBlock (positioned) {DIV} at (426,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (549,335) size 25x26
-  RenderBlock (positioned) {DIV} at (549,335) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (651,333) size 25x26
-  RenderBlock (positioned) {DIV} at (651,333) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (61,453) size 25x26
-  RenderBlock (positioned) {DIV} at (61,453) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (550,101) size 26x25
+  RenderBlock (positioned) {DIV} at (550,101) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (668,101) size 26x25
+  RenderBlock (positioned) {DIV} at (668,101) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (68,208) size 26x25
+  RenderBlock (positioned) {DIV} at (68,208) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (181,178) size 25x25
+  RenderBlock (positioned) {DIV} at (181,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (156,230) size 25x26
+  RenderBlock (positioned) {DIV} at (156,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (181,230) size 25x26
+  RenderBlock (positioned) {DIV} at (181,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (281,178) size 25x25
+  RenderBlock (positioned) {DIV} at (281,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (256,230) size 25x26
+  RenderBlock (positioned) {DIV} at (256,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (281,230) size 25x26
+  RenderBlock (positioned) {DIV} at (281,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (381,178) size 25x25
+  RenderBlock (positioned) {DIV} at (381,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (356,230) size 25x26
+  RenderBlock (positioned) {DIV} at (356,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (381,230) size 25x26
+  RenderBlock (positioned) {DIV} at (381,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (456,230) size 25x26
+  RenderBlock (positioned) {DIV} at (456,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (481,230) size 25x26
+  RenderBlock (positioned) {DIV} at (481,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (558,232) size 25x26
+  RenderBlock (positioned) {DIV} at (558,232) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (656,230) size 25x26
+  RenderBlock (positioned) {DIV} at (656,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (26,350) size 25x26
+  RenderBlock (positioned) {DIV} at (26,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (126,298) size 25x25
+  RenderBlock (positioned) {DIV} at (126,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (151,350) size 25x26
+  RenderBlock (positioned) {DIV} at (151,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (126,350) size 25x26
+  RenderBlock (positioned) {DIV} at (126,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (226,298) size 25x25
+  RenderBlock (positioned) {DIV} at (226,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (251,350) size 25x26
+  RenderBlock (positioned) {DIV} at (251,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (226,350) size 25x26
+  RenderBlock (positioned) {DIV} at (226,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (326,298) size 25x25
+  RenderBlock (positioned) {DIV} at (326,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (351,350) size 25x26
+  RenderBlock (positioned) {DIV} at (351,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (326,350) size 25x26
+  RenderBlock (positioned) {DIV} at (326,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (451,350) size 25x26
+  RenderBlock (positioned) {DIV} at (451,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (426,350) size 25x26
+  RenderBlock (positioned) {DIV} at (426,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (549,352) size 25x26
+  RenderBlock (positioned) {DIV} at (549,352) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (651,350) size 25x26
+  RenderBlock (positioned) {DIV} at (651,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (61,470) size 25x26
+  RenderBlock (positioned) {DIV} at (61,470) size 25x26 [border: (3px solid #0000FF7F)]

diff --git a/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.png b/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.png
index f590446b39f9f2c313e2499b83b2c23c20cc6f40..db1144a9d570fcae9020d6e634649d26a650d63f 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.png and b/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.txt b/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.txt
index b19e27c344bb16a6770a1b5b8e394eb3576df8c6..dc4faaff84db1f7ffbef2ea940c62bb61235872e 100644 (file)
--- a/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/layers-split-across-columns-expected.txt
@@ -1,26 +1,26 @@
-layer at (0,0) size 785x676
+layer at (0,0) size 785x971
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x676
-  RenderBlock {HTML} at (0,0) size 785x676
-    RenderBody {BODY} at (8,8) size 769x660
+layer at (0,0) size 785x971
+  RenderBlock {HTML} at (0,0) size 785x971
+    RenderBody {BODY} at (8,8) size 769x955
       RenderBlock {DIV} at (0,0) size 220x328
         RenderBlock (anonymous) at (0,0) size 220x18
           RenderText {#text} at (0,0) size 65x18
             text run at (0,0) width 65: "Overflow:"
-      RenderText {#text} at (220,314) size 4x18
-        text run at (220,314) width 4: " "
+      RenderText {#text} at (220,609) size 4x18
+        text run at (220,609) width 4: " "
       RenderBlock {DIV} at (224,0) size 220x328
         RenderBlock (anonymous) at (0,0) size 220x18
           RenderText {#text} at (0,0) size 76x18
             text run at (0,0) width 76: "Transforms:"
-      RenderText {#text} at (444,314) size 4x18
-        text run at (444,314) width 4: " "
+      RenderText {#text} at (444,609) size 4x18
+        text run at (444,609) width 4: " "
       RenderBlock {DIV} at (448,0) size 220x328
         RenderBlock (anonymous) at (0,0) size 220x18
           RenderText {#text} at (0,0) size 131x18
             text run at (0,0) width 131: "Relative Positioning:"
       RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,332) size 220x328
+      RenderBlock {DIV} at (0,627) size 220x328
         RenderBlock (anonymous) at (0,0) size 220x18
           RenderText {#text} at (0,0) size 54x18
             text run at (0,0) width 54: "Opacity:"
@@ -63,10 +63,10 @@ layer at (461,31) size 100x600
     RenderBlock (anonymous) at (0,500) size 100x100
       RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#000000]
       RenderText {#text} at (0,0) size 0x0
-layer at (8,358) size 220x310
+layer at (8,653) size 220x310
   RenderBlock {DIV} at (0,18) size 220x310 [border: (5px solid #000000)]
     RenderMultiColumnSet at (5,5) size 210x300
-layer at (13,363) size 100x600 backgroundClip at (0,0) size 785x676 clip at (0,0) size 785x676 outlineClip at (0,0) size 785x676
+layer at (13,658) size 100x600 backgroundClip at (0,0) size 785x971 clip at (0,0) size 785x971 outlineClip at (0,0) size 785x971
   RenderMultiColumnFlowThread at (5,5) size 100x600
     RenderBlock (anonymous) at (0,0) size 100x100
       RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#000000]
@@ -86,7 +86,7 @@ layer at (461,131) size 100x400
     RenderBlock {DIV} at (0,100) size 100x100 [bgcolor=#0000D0]
     RenderBlock {DIV} at (0,200) size 100x100 [bgcolor=#0000B0]
     RenderBlock {DIV} at (0,300) size 100x100 [bgcolor=#000090]
-layer at (13,463) size 100x400 backgroundClip at (0,0) size 785x676 clip at (0,0) size 785x676 outlineClip at (0,0) size 785x676
+layer at (13,758) size 100x400 backgroundClip at (0,0) size 785x971 clip at (0,0) size 785x971 outlineClip at (0,0) size 785x971
   RenderBlock {DIV} at (0,100) size 100x400
     RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#0000F0]
     RenderBlock {DIV} at (0,100) size 100x100 [bgcolor=#0000D0]

diff --git a/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png b/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png
index 031480ac53968f448ad0de157dcccbe5072fc873..484fc0467a2d6fa855b8cc7400b860dc5e8d0eeb 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png and b/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt b/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt
index d8c6593c4d650edf30f6ac7e9c44871d2d569342..016defeb728d6936a7aec3c96d30118a8c2d5c18 100644 (file)
--- a/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt
@@ -17,46 +17,46 @@ layer at (0,0) size 800x600
         RenderBlock {SPAN} at (718,0) size 25x25 [border: (3px solid #0000FF7F)]
         RenderText {#text} at (743,11) size 4x18
           text run at (743,11) width 4: "."
-      RenderBlock (anonymous) at (0,45) size 784x330
-        RenderText {#text} at (116,72) size 4x18
-          text run at (116,72) width 4: " "
-        RenderText {#text} at (236,72) size 4x18
-          text run at (236,72) width 4: " "
-        RenderText {#text} at (356,72) size 4x18
-          text run at (356,72) width 4: " "
-        RenderText {#text} at (476,72) size 4x18
-          text run at (476,72) width 4: " "
-        RenderText {#text} at (596,72) size 4x18
-          text run at (596,72) width 4: " "
-        RenderText {#text} at (716,72) size 4x18
-          text run at (716,72) width 4: " "
-        RenderText {#text} at (116,192) size 4x18
-          text run at (116,192) width 4: " "
-        RenderText {#text} at (206,192) size 4x18
-          text run at (206,192) width 4: " "
-        RenderText {#text} at (296,192) size 4x18
-          text run at (296,192) width 4: " "
-        RenderText {#text} at (386,192) size 4x18
-          text run at (386,192) width 4: " "
-        RenderText {#text} at (476,192) size 4x18
-          text run at (476,192) width 4: " "
-        RenderText {#text} at (566,192) size 4x18
-          text run at (566,192) width 4: " "
-        RenderText {#text} at (656,192) size 4x18
-          text run at (656,192) width 4: " "
+      RenderBlock (anonymous) at (0,45) size 784x357
+        RenderText {#text} at (116,99) size 4x18
+          text run at (116,99) width 4: " "
+        RenderText {#text} at (236,99) size 4x18
+          text run at (236,99) width 4: " "
+        RenderText {#text} at (356,99) size 4x18
+          text run at (356,99) width 4: " "
+        RenderText {#text} at (476,99) size 4x18
+          text run at (476,99) width 4: " "
+        RenderText {#text} at (596,99) size 4x18
+          text run at (596,99) width 4: " "
+        RenderText {#text} at (716,99) size 4x18
+          text run at (716,99) width 4: " "
+        RenderText {#text} at (116,219) size 4x18
+          text run at (116,219) width 4: " "
+        RenderText {#text} at (206,219) size 4x18
+          text run at (206,219) width 4: " "
+        RenderText {#text} at (296,219) size 4x18
+          text run at (296,219) width 4: " "
+        RenderText {#text} at (386,219) size 4x18
+          text run at (386,219) width 4: " "
+        RenderText {#text} at (476,219) size 4x18
+          text run at (476,219) width 4: " "
+        RenderText {#text} at (566,219) size 4x18
+          text run at (566,219) width 4: " "
+        RenderText {#text} at (656,219) size 4x18
+          text run at (656,219) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (86,312) size 4x18
-          text run at (86,312) width 4: " "
-        RenderText {#text} at (176,312) size 4x18
-          text run at (176,312) width 4: " "
-        RenderText {#text} at (266,312) size 4x18
-          text run at (266,312) width 4: " "
-        RenderText {#text} at (356,312) size 4x18
-          text run at (356,312) width 4: " "
-        RenderText {#text} at (446,312) size 4x18
-          text run at (446,312) width 4: " "
-        RenderText {#text} at (536,312) size 4x18
-          text run at (536,312) width 4: " "
+        RenderText {#text} at (86,339) size 4x18
+          text run at (86,339) width 4: " "
+        RenderText {#text} at (176,339) size 4x18
+          text run at (176,339) width 4: " "
+        RenderText {#text} at (266,339) size 4x18
+          text run at (266,339) width 4: " "
+        RenderText {#text} at (356,339) size 4x18
+          text run at (356,339) width 4: " "
+        RenderText {#text} at (446,339) size 4x18
+          text run at (446,339) width 4: " "
+        RenderText {#text} at (536,339) size 4x18
+          text run at (536,339) width 4: " "
         RenderText {#text} at (0,0) size 0x0
 layer at (8,63) size 116x66
   RenderBlock {DIV} at (0,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
@@ -104,10 +104,10 @@ layer at (376,71) size 48x100
       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 (488,63) size 116x66
-  RenderBlock {DIV} at (480,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (488,81) size 116x66
+  RenderBlock {DIV} at (480,28) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x50
-layer at (496,71) size 48x79
+layer at (496,89) size 48x79
   RenderMultiColumnFlowThread at (8,8) size 48x79
     RenderBlock (anonymous) at (0,0) size 48x25
       RenderBR {BR} at (0,0) size 0x25
@@ -117,36 +117,36 @@ layer at (496,71) size 48x79
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (608,63) size 116x66
-  RenderBlock {DIV} at (600,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (608,83) size 116x66
+  RenderBlock {DIV} at (600,30) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x50
-layer at (616,71) size 48x75
+layer at (616,91) size 48x75
   RenderMultiColumnFlowThread at (8,8) size 48x75
     RenderBlock (anonymous) at (0,0) size 48x25
       RenderBR {BR} at (0,0) size 0x25
     RenderBlock {DIV} at (0,25) size 48x50
       RenderBR {BR} at (0,0) size 0x25
       RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
-layer at (8,183) size 116x66
-  RenderBlock {DIV} at (0,130) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (8,210) size 116x66
+  RenderBlock {DIV} at (0,157) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 100x50
-layer at (16,191) size 48x65
+layer at (16,218) size 48x65
   RenderMultiColumnFlowThread at (8,8) size 48x65
     RenderBlock {DIV} at (0,40) size 25x25 [bgcolor=#ADD8E6]
-layer at (138,143) size 66x116
-  RenderBlock {DIV} at (130,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (138,170) size 66x116
+  RenderBlock {DIV} at (130,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (146,151) size 100x48
+layer at (146,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderText {#text} at (25,0) size 75x25
       text run at (25,0) width 25: "x"
       text run at (50,0) width 25: "y"
       text run at (75,0) width 25: "z"
-layer at (228,143) size 66x116
-  RenderBlock {DIV} at (220,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (228,170) size 66x116
+  RenderBlock {DIV} at (220,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (236,151) size 100x48
+layer at (236,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderInline {SPAN} at (0,0) size 75x25
@@ -155,10 +155,10 @@ layer at (236,151) size 100x48
         text run at (50,0) width 25: "y"
         text run at (75,0) width 25: "z"
     RenderText {#text} at (0,0) size 0x0
-layer at (318,143) size 66x116
-  RenderBlock {DIV} at (310,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (318,170) size 66x116
+  RenderBlock {DIV} at (310,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (326,151) size 100x48
+layer at (326,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -167,10 +167,10 @@ layer at (326,151) size 100x48
         text run at (0,0) width 25: "x"
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (408,143) size 66x116
-  RenderBlock {DIV} at (400,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (408,170) size 66x116
+  RenderBlock {DIV} at (400,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (416,151) size 100x48
+layer at (416,178) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -179,10 +179,10 @@ layer at (416,151) size 100x48
       RenderText {#text} at (25,0) size 50x25
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (498,143) size 66x116
-  RenderBlock {DIV} at (490,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (498,170) size 66x116
+  RenderBlock {DIV} at (490,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (506,151) size 79x48
+layer at (506,178) size 79x48
   RenderMultiColumnFlowThread at (8,8) size 79x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -192,36 +192,36 @@ layer at (506,151) size 79x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (588,143) size 66x116
-  RenderBlock {DIV} at (580,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (588,170) size 66x116
+  RenderBlock {DIV} at (580,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (596,151) size 75x48
+layer at (596,178) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
     RenderBlock {DIV} at (25,0) size 50x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (678,143) size 66x116
-  RenderBlock {DIV} at (670,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (678,170) size 66x116
+  RenderBlock {DIV} at (670,117) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (686,151) size 65x48
+layer at (686,178) size 65x48
   RenderMultiColumnFlowThread at (8,8) size 65x48
     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (18,263) size 66x116
-  RenderBlock {DIV} at (10,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (18,290) size 66x116
+  RenderBlock {DIV} at (10,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (-24,271) size 100x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+layer at (-24,298) size 100x48 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderText {#text} at (25,0) size 75x25
       text run at (25,0) width 25: "x"
       text run at (50,0) width 25: "y"
       text run at (75,0) width 25: "z"
-layer at (108,263) size 66x116
-  RenderBlock {DIV} at (100,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (108,290) size 66x116
+  RenderBlock {DIV} at (100,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (66,271) size 100x48
+layer at (66,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBR {BR} at (0,0) size 25x0
     RenderInline {SPAN} at (0,0) size 75x25
@@ -230,10 +230,10 @@ layer at (66,271) size 100x48
         text run at (50,0) width 25: "y"
         text run at (75,0) width 25: "z"
     RenderText {#text} at (0,0) size 0x0
-layer at (198,263) size 66x116
-  RenderBlock {DIV} at (190,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (198,290) size 66x116
+  RenderBlock {DIV} at (190,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (156,271) size 100x48
+layer at (156,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -242,10 +242,10 @@ layer at (156,271) size 100x48
         text run at (0,0) width 25: "x"
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (288,263) size 66x116
-  RenderBlock {DIV} at (280,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (288,290) size 66x116
+  RenderBlock {DIV} at (280,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (246,271) size 100x48
+layer at (246,298) size 100x48
   RenderMultiColumnFlowThread at (8,8) size 100x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -254,10 +254,10 @@ layer at (246,271) size 100x48
       RenderText {#text} at (25,0) size 50x25
         text run at (25,0) width 25: "y"
         text run at (50,0) width 25: "z"
-layer at (378,263) size 66x116
-  RenderBlock {DIV} at (370,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (378,290) size 66x116
+  RenderBlock {DIV} at (370,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (357,271) size 79x48
+layer at (357,298) size 79x48
   RenderMultiColumnFlowThread at (8,8) size 79x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
@@ -267,20 +267,20 @@ layer at (357,271) size 79x48
         RenderFlexibleBox {DIV} at (0,0) size 25x25
           RenderBlock {DIV} at (0,12) size 25x0
             RenderBlock {DIV} at (0,0) size 25x0
-layer at (468,263) size 66x116
-  RenderBlock {DIV} at (460,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (468,290) size 66x116
+  RenderBlock {DIV} at (460,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (451,271) size 75x48
+layer at (451,298) size 75x48
   RenderMultiColumnFlowThread at (8,8) size 75x48
     RenderBlock (anonymous) at (0,0) size 25x48
       RenderBR {BR} at (0,0) size 25x0
     RenderBlock {DIV} at (25,0) size 50x48
       RenderBR {BR} at (0,0) size 25x0
       RenderImage {IMG} at (25,0) size 25x25 [bgcolor=#ADD8E6]
-layer at (558,263) size 66x116
-  RenderBlock {DIV} at (550,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+layer at (558,290) size 66x116
+  RenderBlock {DIV} at (550,237) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
     RenderMultiColumnSet at (8,8) size 50x100
-layer at (551,271) size 65x48
+layer at (551,298) size 65x48
   RenderMultiColumnFlowThread at (8,8) size 65x48
     RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
 layer at (16,96) size 25x25
@@ -305,65 +305,65 @@ layer at (428,71) size 26x25
   RenderBlock (positioned) {DIV} at (428,71) size 26x25 [border: (3px solid #0000FF7F)]
 layer at (428,96) size 26x25
   RenderBlock (positioned) {DIV} at (428,96) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (550,73) size 26x25
-  RenderBlock (positioned) {DIV} at (550,73) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (668,71) size 26x25
-  RenderBlock (positioned) {DIV} at (668,71) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (68,181) size 26x25
-  RenderBlock (positioned) {DIV} at (68,181) size 26x25 [border: (3px solid #0000FF7F)]
-layer at (171,151) size 25x25
-  RenderBlock (positioned) {DIV} at (171,151) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (146,203) size 25x26
-  RenderBlock (positioned) {DIV} at (146,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (171,203) size 25x26
-  RenderBlock (positioned) {DIV} at (171,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (261,151) size 25x25
-  RenderBlock (positioned) {DIV} at (261,151) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (236,203) size 25x26
-  RenderBlock (positioned) {DIV} at (236,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (261,203) size 25x26
-  RenderBlock (positioned) {DIV} at (261,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (351,151) size 25x25
-  RenderBlock (positioned) {DIV} at (351,151) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (326,203) size 25x26
-  RenderBlock (positioned) {DIV} at (326,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (351,203) size 25x26
-  RenderBlock (positioned) {DIV} at (351,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (416,203) size 25x26
-  RenderBlock (positioned) {DIV} at (416,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (441,203) size 25x26
-  RenderBlock (positioned) {DIV} at (441,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (508,205) size 25x26
-  RenderBlock (positioned) {DIV} at (508,205) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (596,203) size 25x26
-  RenderBlock (positioned) {DIV} at (596,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (676,203) size 25x26
-  RenderBlock (positioned) {DIV} at (676,203) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (26,271) size 25x25
-  RenderBlock (positioned) {DIV} at (26,271) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (51,323) size 25x26
-  RenderBlock (positioned) {DIV} at (51,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (26,323) size 25x26
-  RenderBlock (positioned) {DIV} at (26,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (116,271) size 25x25
-  RenderBlock (positioned) {DIV} at (116,271) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (141,323) size 25x26
-  RenderBlock (positioned) {DIV} at (141,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (116,323) size 25x26
-  RenderBlock (positioned) {DIV} at (116,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (206,271) size 25x25
-  RenderBlock (positioned) {DIV} at (206,271) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (231,323) size 25x26
-  RenderBlock (positioned) {DIV} at (231,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (206,323) size 25x26
-  RenderBlock (positioned) {DIV} at (206,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (321,323) size 25x26
-  RenderBlock (positioned) {DIV} at (321,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (296,323) size 25x26
-  RenderBlock (positioned) {DIV} at (296,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (409,325) size 25x26
-  RenderBlock (positioned) {DIV} at (409,325) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (501,323) size 25x26
-  RenderBlock (positioned) {DIV} at (501,323) size 25x26 [border: (3px solid #0000FF7F)]
-layer at (601,323) size 25x26
-  RenderBlock (positioned) {DIV} at (601,323) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (550,91) size 26x25
+  RenderBlock (positioned) {DIV} at (550,91) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (668,91) size 26x25
+  RenderBlock (positioned) {DIV} at (668,91) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (68,208) size 26x25
+  RenderBlock (positioned) {DIV} at (68,208) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (171,178) size 25x25
+  RenderBlock (positioned) {DIV} at (171,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (146,230) size 25x26
+  RenderBlock (positioned) {DIV} at (146,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (171,230) size 25x26
+  RenderBlock (positioned) {DIV} at (171,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (261,178) size 25x25
+  RenderBlock (positioned) {DIV} at (261,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (236,230) size 25x26
+  RenderBlock (positioned) {DIV} at (236,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (261,230) size 25x26
+  RenderBlock (positioned) {DIV} at (261,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (351,178) size 25x25
+  RenderBlock (positioned) {DIV} at (351,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (326,230) size 25x26
+  RenderBlock (positioned) {DIV} at (326,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (351,230) size 25x26
+  RenderBlock (positioned) {DIV} at (351,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (416,230) size 25x26
+  RenderBlock (positioned) {DIV} at (416,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (441,230) size 25x26
+  RenderBlock (positioned) {DIV} at (441,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (508,232) size 25x26
+  RenderBlock (positioned) {DIV} at (508,232) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (596,230) size 25x26
+  RenderBlock (positioned) {DIV} at (596,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (676,230) size 25x26
+  RenderBlock (positioned) {DIV} at (676,230) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (26,298) size 25x25
+  RenderBlock (positioned) {DIV} at (26,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (51,350) size 25x26
+  RenderBlock (positioned) {DIV} at (51,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (26,350) size 25x26
+  RenderBlock (positioned) {DIV} at (26,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (116,298) size 25x25
+  RenderBlock (positioned) {DIV} at (116,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (141,350) size 25x26
+  RenderBlock (positioned) {DIV} at (141,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (116,350) size 25x26
+  RenderBlock (positioned) {DIV} at (116,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (206,298) size 25x25
+  RenderBlock (positioned) {DIV} at (206,298) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (231,350) size 25x26
+  RenderBlock (positioned) {DIV} at (231,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (206,350) size 25x26
+  RenderBlock (positioned) {DIV} at (206,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (321,350) size 25x26
+  RenderBlock (positioned) {DIV} at (321,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (296,350) size 25x26
+  RenderBlock (positioned) {DIV} at (296,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (409,352) size 25x26
+  RenderBlock (positioned) {DIV} at (409,352) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (501,350) size 25x26
+  RenderBlock (positioned) {DIV} at (501,350) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (601,350) size 25x26
+  RenderBlock (positioned) {DIV} at (601,350) size 25x26 [border: (3px solid #0000FF7F)]

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f2c8dd709d55c45433f39eed77aca9edd9580fe0..de88c31dd3c904f79657e7cae6df4b95484c276a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,45 @@
+2014-12-08  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Inline elements whose parents have small line-height are laid out too low
+        https://bugs.webkit.org/show_bug.cgi?id=139375
+
+        Reviewed by Dave Hyatt.
+
+        This is a port of the Blink patch at
+        https://src.chromium.org/viewvc/blink?revision=155253&view=revision.
+
+        When laying out inline elements, we try to align leaf children's parents'
+        baselines across the entire line. However, if you set line-height: 0px on a
+        span, the entire InlineBox which represents that span will have a height of
+        0, and therefore be laid out entirely on the baseline. In addition, we will
+        try to vertically center the leaf text in the span's InlineBox, which means
+        the leaf text will be vertically centered on the baseline. All the other
+        major browsers do not have this behavior; instead, they line up the boxes
+        as you would expect.
+
+        This bug led to a rendering problem on the front page of the New York Times.
+
+        Here is the ChangeLog from the Blink patch:
+
+        Fix baseline position when it is outside the element's box
+
+        Specifically, we shouldn't force the baseline to be inside the element. IE
+        and FF don't do this, and it's incompatible with the CSS spec:
+        
+        "The baseline of an 'inline-block' is the baseline of its last line box in
+        the normal flow, unless it has either no in-flow line boxes or if its
+        'overflow' property has a computed value other than 'visible', in which case
+        the baseline is the bottom margin edge."
+        -- http://www.w3.org/TR/CSS21/visudet.html#leading
+        
+        It doesn't have a special case for "baseline is outside of the element's
+        margin box".
+        
+        Test: fast/text/small-line-height.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::baselinePosition):
+
 2014-12-08  Eric Carlson  <eric.carlson@apple.com>
 
         [iOS] YouTube plug-in replacement should support partial urls

diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp
index 3917e6b04599c984dba1b4eeed1b977581fecaa8..0262599ef4316cfbb571655e00c8bce891fb4fbd 100644 (file)
--- a/Source/WebCore/rendering/RenderBlock.cpp
+++ b/Source/WebCore/rendering/RenderBlock.cpp
@@ -2861,17 +2861,25 @@ int RenderBlock::baselinePosition(FontBaseline baselineType, bool firstLine, Lin
         // the normal flow.  We make an exception for marquees, since their baselines are meaningless
         // (the content inside them moves).  This matches WinIE as well, which just bottom-aligns them.
         // We also give up on finding a baseline if we have a vertical scrollbar, or if we are scrolled
-        // vertically (e.g., an overflow:hidden block that has had scrollTop moved) or if the baseline is outside
-        // of our content box.
+        // vertically (e.g., an overflow:hidden block that has had scrollTop moved).
         bool ignoreBaseline = (layer() && (layer()->marquee() || (direction == HorizontalLine ? (layer()->verticalScrollbar() || layer()->scrollYOffset() != 0)
             : (layer()->horizontalScrollbar() || layer()->scrollXOffset() != 0)))) || (isWritingModeRoot() && !isRubyRun());
         
         int baselinePos = ignoreBaseline ? -1 : inlineBlockBaseline(direction);
         
-        LayoutUnit bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
-        if (baselinePos != -1 && baselinePos <= bottomOfContent)
+        if (isDeprecatedFlexibleBox()) {
+            // Historically, we did this check for all baselines. But we can't
+            // remove this code from deprecated flexbox, because it effectively
+            // breaks -webkit-line-clamp, which is used in the wild -- we would
+            // calculate the baseline as if -webkit-line-clamp wasn't used.
+            // For simplicity, we use this for all uses of deprecated flexbox.
+            LayoutUnit bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
+            if (baselinePos > bottomOfContent)
+                baselinePos = -1;
+        }
+        if (baselinePos != -1)
             return direction == HorizontalLine ? marginTop() + baselinePos : marginRight() + baselinePos;
-            
+
         return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
     }