<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165991] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165991">165991</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 13:26:28 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] getClientRects returns wrong rectangle
https://bugs.webkit.org/show_bug.cgi?id=128614
Reviewed by Sam Weinig.
Added fast/multicol/newmulticol/client-rects.html and beefed up existing
fast/multicol/client-rects.html to use more writing modes.
Source/WebCore:
* rendering/LayoutState.h:
Removed unused function.
* rendering/RenderFlowThread.h:
Make mapFlowToRegion virtual so that RenderMultiColumnFlowThread can
override it.
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::mapFromFlowToRegion):
* rendering/RenderMultiColumnFlowThread.h:
Implement mapFlowToRegion to correctly translate a flow thread position
into a column offset within a region.
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::columnTranslationForOffset):
(WebCore::RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect):
* rendering/RenderMultiColumnSet.h:
Refactored some code to make a columnTranslationForOffset helper that
can be used by RenderMultiColumnFlowThread.
LayoutTests:
* fast/multicol/client-rects.html:
* fast/multicol/newmulticol/client-rects-expected.html: Added.
* fast/multicol/newmulticol/client-rects.html: Added.
* platform/mac/fast/multicol/client-rects-expected.png:
* platform/mac/fast/multicol/client-rects-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmulticolclientrectshtml">trunk/LayoutTests/fast/multicol/client-rects.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolclientrectsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolclientrectsexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStateh">trunk/Source/WebCore/rendering/LayoutState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSeth">trunk/Source/WebCore/rendering/RenderMultiColumnSet.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolclientrectshtml">trunk/LayoutTests/fast/multicol/newmulticol/client-rects.html</a></li>
<li>trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/</li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolnewmulticolclientrectsexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolnewmulticolclientrectsexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/LayoutTests/ChangeLog 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-20 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] getClientRects returns wrong rectangle
+ https://bugs.webkit.org/show_bug.cgi?id=128614
+
+ Reviewed by Sam Weinig.
+
+ Added fast/multicol/newmulticol/client-rects.html and beefed up existing
+ fast/multicol/client-rects.html to use more writing modes.
+
+ * fast/multicol/client-rects.html:
+ * fast/multicol/newmulticol/client-rects-expected.html: Added.
+ * fast/multicol/newmulticol/client-rects.html: Added.
+ * platform/mac/fast/multicol/client-rects-expected.png:
+ * platform/mac/fast/multicol/client-rects-expected.txt:
+
</ins><span class="cx"> 2014-03-19 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Incorrect behavior when mutating a typed array during set.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolclientrectshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/multicol/client-rects.html (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/client-rects.html 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/LayoutTests/fast/multicol/client-rects.html 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -1,18 +1,20 @@
</span><span class="cx"> <style>
</span><span class="cx"> div.columns {
</span><del>- height: 50px;
- width: 110px;
- margin: 10px 0;
- padding: 10px;
</del><ins>+ display:inline-block;
+ -webkit-logical-height: 50px;
+ -webkit-logical-width: 100px;
+ -webkit-margin-before: 10px;
+ -webkit-margin-after: 10px;
+ padding: 5px;
</ins><span class="cx"> border: solid black;
</span><span class="cx"> font-family: ahem;
</span><span class="cx"> font-size: 25px;
</span><span class="cx"> color: lightblue;
</span><span class="cx"> -webkit-columns: 2;
</span><del>- -webkit-column-gap: 10px;
</del><ins>+ -webkit-column-gap: 5px;
</ins><span class="cx"> -webkit-column-fill: auto;
</span><span class="cx"> columns: 2;
</span><del>- column-gap: 10px;
</del><ins>+ column-gap: 5px;
</ins><span class="cx"> column-fill: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -32,6 +34,9 @@
</span><span class="cx"> input[type="range"]::-webkit-slider-thumb {
</span><span class="cx"> -webkit-appearance: none;
</span><span class="cx"> }
</span><ins>+
+ .vertical { -webkit-writing-mode: vertical-lr; }
+ .vertical.flipped { -webkit-writing-mode: vertical-rl; }
</ins><span class="cx"> </style>
</span><span class="cx"> <p>
</span><span class="cx"> The blue borders should coincide with light blue squares, like this:
</span><span class="lines">@@ -64,15 +69,66 @@
</span><span class="cx"> <div class="columns">
</span><span class="cx"> <br><div><br><img id="t6" style="width: 25px; height: 25px; background-color: lightblue;"></div>
</span><span class="cx"> </div>
</span><del>-
-<p>
- Except here, where the blue border should be around the bigger slice of the blue square, on the right.
-</p>
-
</del><span class="cx"> <div class="columns">
</span><span class="cx"> <div id="t7" style=" margin-top: 40px; width: 25px; height: 25px; background-color: lightblue;"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<div class="columns vertical" id="t8">
+ <br>x y z
+</div>
+
+<div class="columns vertical">
+ <br><span id="t9">x y z</span>
+</div>
+
+<div class="columns vertical">
+ <br><div id="t10">x y z</div>
+</div>
+
+<div class="columns vertical">
+ <br><div id="t11"><br>y z</div>
+</div>
+
+<div class="columns vertical">
+ <br><div><br><input id="t12" type="range"></div>
+</div>
+
+<div class="columns vertical">
+ <br><div><br><img id="t13" style="width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+<div class="columns vertical">
+ <div id="t14" style=" -webkit-margin-before: 40px; width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+
+
+<div class="columns vertical flipped" id="t15">
+ <br>x y z
+</div>
+
+<div class="columns vertical flipped">
+ <br><span id="t16">x y z</span>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div id="t17">x y z</div>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div id="t18"><br>y z</div>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div><br><input id="t19" type="range"></div>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div><br><img id="t20" style="width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+<div class="columns vertical flipped">
+ <div id="t21" style="-webkit-margin-before: 40px; width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+
+
</ins><span class="cx"> <script>
</span><span class="cx"> function placeMarker(clientRect)
</span><span class="cx"> {
</span><span class="lines">@@ -126,4 +182,67 @@
</span><span class="cx"> var div = document.getElementById("t7");
</span><span class="cx"> range.selectNode(div);
</span><span class="cx"> placeMarkersForRange(div);
</span><ins>+
+ var textNode = document.getElementById("t8").firstChild.nextSibling.nextSibling;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t9").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t10").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ var block = document.getElementById("t11");
+ range.selectNode(block);
+ placeMarkersForRange(range, 1);
+
+ var slider = document.getElementById("t12");
+ range.selectNode(slider);
+ placeMarkersForRange(range);
+
+ var image = document.getElementById("t13");
+ range.selectNode(image);
+ placeMarkersForRange(range);
+
+ var div = document.getElementById("t14");
+ range.selectNode(div);
+ placeMarkersForRange(div);
+
+ var textNode = document.getElementById("t15").firstChild.nextSibling.nextSibling;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t16").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t17").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ var block = document.getElementById("t18");
+ range.selectNode(block);
+ placeMarkersForRange(range, 1);
+
+ var slider = document.getElementById("t19");
+ range.selectNode(slider);
+ placeMarkersForRange(range);
+
+ var image = document.getElementById("t20");
+ range.selectNode(image);
+ placeMarkersForRange(range);
+
+ var div = document.getElementById("t21");
+ range.selectNode(div);
+ placeMarkersForRange(div);
+
</ins><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolclientrectshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/client-rects.html (0 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/client-rects.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/client-rects.html 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -0,0 +1,254 @@
</span><ins>+<head>
+<script>
+internals.settings.setRegionBasedColumnsEnabled(true)
+</script>
+<style>
+ div.columns {
+ display:inline-block;
+ -webkit-logical-height: 50px;
+ -webkit-logical-width: 100px;
+ -webkit-margin-before: 10px;
+ -webkit-margin-after: 10px;
+ padding: 5px;
+ border: solid black;
+ font-family: ahem;
+ font-size: 25px;
+ color: lightblue;
+ -webkit-columns: 2;
+ -webkit-column-gap: 5px;
+ -webkit-column-fill: auto;
+ columns: 2;
+ column-gap: 5px;
+ column-fill: auto;
+ }
+
+ div.marker {
+ position: absolute;
+ border: solid rgba(0, 0, 255, 0.5);
+ -webkit-box-sizing: border-box;
+ }
+
+ input[type="range"] {
+ -webkit-appearance: none;
+ width: 25px;
+ height: 25px;
+ background-color: lightblue;
+ }
+
+ input[type="range"]::-webkit-slider-thumb {
+ -webkit-appearance: none;
+ }
+
+ .vertical { -webkit-writing-mode: vertical-lr; }
+ .vertical.flipped { -webkit-writing-mode: vertical-rl; }
+
+</style>
+</head>
+<p>
+ The blue borders should coincide with light blue squares, like this:
+ <span style="display: inline-block; background-color: lightblue; border: solid rgba(0, 0, 255, 0.5); width: 19px; height: 19px;"></span>.
+ There should be none of this:
+ <span style="display: inline-block; background-color: lightblue; width: 25px; height: 25px;"></span>
+ or this:
+ <span style="display: inline-block; border: solid rgba(0, 0, 255, 0.5); width: 19px; height: 19px;"></span>.
+</p>
+<div class="columns" id="t1">
+ <br>x y z
+</div>
+
+<div class="columns">
+ <br><span id="t2">x y z</span>
+</div>
+
+<div class="columns">
+ <br><div id="t3">x y z</div>
+</div>
+
+<div class="columns">
+ <br><div id="t4"><br>y z</div>
+</div>
+
+<div class="columns">
+ <br><div><br><input id="t5" type="range"></div>
+</div>
+
+<div class="columns">
+ <br><div><br><img id="t6" style="width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+<div class="columns">
+ <div id="t7" style=" margin-top: 40px; width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+
+<div class="columns vertical" id="t8">
+ <br>x y z
+</div>
+
+<div class="columns vertical">
+ <br><span id="t9">x y z</span>
+</div>
+
+<div class="columns vertical">
+ <br><div id="t10">x y z</div>
+</div>
+
+<div class="columns vertical">
+ <br><div id="t11"><br>y z</div>
+</div>
+
+<div class="columns vertical">
+ <br><div><br><input id="t12" type="range"></div>
+</div>
+
+<div class="columns vertical">
+ <br><div><br><img id="t13" style="width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+<div class="columns vertical">
+ <div id="t14" style=" -webkit-margin-before: 40px; width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+
+
+<div class="columns vertical flipped" id="t15">
+ <br>x y z
+</div>
+
+<div class="columns vertical flipped">
+ <br><span id="t16">x y z</span>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div id="t17">x y z</div>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div id="t18"><br>y z</div>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div><br><input id="t19" type="range"></div>
+</div>
+
+<div class="columns vertical flipped">
+ <br><div><br><img id="t20" style="width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+<div class="columns vertical flipped">
+ <div id="t21" style="-webkit-margin-before: 40px; width: 25px; height: 25px; background-color: lightblue;"></div>
+</div>
+
+
+<script>
+ function placeMarker(clientRect)
+ {
+ var marker = document.body.appendChild(document.createElement("div"));
+ marker.className = "marker";
+ marker.style.left = clientRect.left + "px";
+ marker.style.top = clientRect.top + "px";
+ marker.style.width = clientRect.width + "px";
+ marker.style.height = clientRect.height + "px";
+ }
+
+ function placeMarkersForRange(range, startOffset)
+ {
+ if (startOffset === undefined)
+ startOffset = 0;
+
+ var clientRects = range.getClientRects();
+ for (var i = startOffset; i < clientRects.length; ++i)
+ placeMarker(clientRects[i]);
+ }
+
+ var range = document.createRange();
+
+ var textNode = document.getElementById("t1").firstChild.nextSibling.nextSibling;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t2").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t3").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ var block = document.getElementById("t4");
+ range.selectNode(block);
+ placeMarkersForRange(range, 1);
+
+ var slider = document.getElementById("t5");
+ range.selectNode(slider);
+ placeMarkersForRange(range);
+
+ var image = document.getElementById("t6");
+ range.selectNode(image);
+ placeMarkersForRange(range);
+
+ var div = document.getElementById("t7");
+ range.selectNode(div);
+ placeMarkersForRange(div);
+
+ var textNode = document.getElementById("t8").firstChild.nextSibling.nextSibling;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t9").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t10").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ var block = document.getElementById("t11");
+ range.selectNode(block);
+ placeMarkersForRange(range, 1);
+
+ var slider = document.getElementById("t12");
+ range.selectNode(slider);
+ placeMarkersForRange(range);
+
+ var image = document.getElementById("t13");
+ range.selectNode(image);
+ placeMarkersForRange(range);
+
+ var div = document.getElementById("t14");
+ range.selectNode(div);
+ placeMarkersForRange(div);
+
+ var textNode = document.getElementById("t15").firstChild.nextSibling.nextSibling;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t16").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ textNode = document.getElementById("t17").firstChild;
+ range.setStart(textNode, 0);
+ range.setEnd(textNode, 5);
+ placeMarkersForRange(range);
+
+ var block = document.getElementById("t18");
+ range.selectNode(block);
+ placeMarkersForRange(range, 1);
+
+ var slider = document.getElementById("t19");
+ range.selectNode(slider);
+ placeMarkersForRange(range);
+
+ var image = document.getElementById("t20");
+ range.selectNode(image);
+ placeMarkersForRange(range);
+
+ var div = document.getElementById("t21");
+ range.selectNode(div);
+ placeMarkersForRange(div);
+
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolclientrectsexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolclientrectsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/LayoutTests/platform/mac/fast/multicol/client-rects-expected.txt 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-layer at (0,0) size 785x695
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x695
- RenderBlock {HTML} at (0,0) size 785x695
- RenderBody {BODY} at (8,8) size 769x677
- RenderBlock {P} at (0,0) size 769x29
</del><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x29
</ins><span class="cx"> RenderText {#text} at (0,11) size 421x18
</span><span class="cx"> text run at (0,11) width 421: "The blue borders should coincide with light blue squares, like this: "
</span><span class="cx"> RenderBlock {SPAN} at (421,0) size 25x25 [bgcolor=#ADD8E6] [border: (3px solid #0000FF7F)]
</span><span class="lines">@@ -17,88 +17,290 @@
</span><span class="cx"> RenderBlock {SPAN} at (718,0) size 25x25 [border: (3px solid #0000FF7F)]
</span><span class="cx"> RenderText {#text} at (743,11) size 4x18
</span><span class="cx"> text run at (743,11) width 4: "."
</span><del>- RenderBlock {P} at (0,567) size 769x18
- RenderText {#text} at (0,0) size 633x18
- text run at (0,0) width 633: "Except here, where the blue border should be around the bigger slice of the blue square, on the right."
-layer at (8,53) size 136x76
- RenderBlock {DIV} at (0,45) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBR {BR} at (13,13) size 0x25
- RenderText {#text} at (13,38) size 25x75
- text run at (13,38) width 25: "x"
- text run at (13,63) width 25: "y"
- text run at (13,88) width 25: "z"
-layer at (8,139) size 136x76
- RenderBlock {DIV} at (0,131) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBR {BR} at (13,13) size 0x25
</del><ins>+ 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: " "
+ 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 (0,0) size 0x0
+layer at (8,63) size 116x66
+ RenderBlock {DIV} at (0,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (8,8) size 0x25
+ RenderText {#text} at (8,33) size 25x75
+ text run at (8,33) width 25: "x"
+ text run at (8,58) width 25: "y"
+ text run at (8,83) width 25: "z"
+layer at (128,63) size 116x66
+ RenderBlock {DIV} at (120,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (8,8) size 0x25
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 25x75
</span><del>- RenderText {#text} at (13,38) size 25x75
- text run at (13,38) width 25: "x"
- text run at (13,63) width 25: "y"
- text run at (13,88) width 25: "z"
</del><ins>+ RenderText {#text} at (8,33) size 25x75
+ text run at (8,33) width 25: "x"
+ text run at (8,58) width 25: "y"
+ text run at (8,83) width 25: "z"
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>-layer at (8,225) size 136x76
- RenderBlock {DIV} at (0,217) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBlock (anonymous) at (13,13) size 50x25
</del><ins>+layer at (248,63) size 116x66
+ RenderBlock {DIV} at (240,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (8,8) size 48x25
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><del>- RenderBlock {DIV} at (13,38) size 50x75
</del><ins>+ RenderBlock {DIV} at (8,33) size 48x75
</ins><span class="cx"> RenderText {#text} at (0,0) size 25x75
</span><span class="cx"> text run at (0,0) width 25: "x"
</span><span class="cx"> text run at (0,25) width 25: "y"
</span><span class="cx"> text run at (0,50) width 25: "z"
</span><del>-layer at (8,311) size 136x76
- RenderBlock {DIV} at (0,303) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBlock (anonymous) at (13,13) size 50x25
</del><ins>+layer at (368,63) size 116x66
+ RenderBlock {DIV} at (360,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (8,8) size 48x25
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><del>- RenderBlock {DIV} at (13,38) size 50x75
</del><ins>+ RenderBlock {DIV} at (8,33) size 48x75
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><span class="cx"> RenderText {#text} at (0,25) size 25x50
</span><span class="cx"> text run at (0,25) width 25: "y"
</span><span class="cx"> text run at (0,50) width 25: "z"
</span><del>-layer at (8,397) size 136x76
- RenderBlock {DIV} at (0,389) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBlock (anonymous) at (13,13) size 50x25
</del><ins>+layer at (488,63) size 116x66
+ RenderBlock {DIV} at (480,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (8,8) size 48x25
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><del>- RenderBlock {DIV} at (13,38) size 50x54
</del><ins>+ RenderBlock {DIV} at (8,33) size 48x54
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><span class="cx"> RenderSlider {INPUT} at (2,27) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 25x25
</span><span class="cx"> RenderBlock {DIV} at (0,12) size 25x1
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 25x0
</span><del>-layer at (8,483) size 136x76
- RenderBlock {DIV} at (0,475) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBlock (anonymous) at (13,13) size 50x25
</del><ins>+layer at (608,63) size 116x66
+ RenderBlock {DIV} at (600,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock (anonymous) at (8,8) size 48x25
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><del>- RenderBlock {DIV} at (13,38) size 50x50
</del><ins>+ RenderBlock {DIV} at (8,33) size 48x50
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x25
</span><span class="cx"> RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
</span><del>-layer at (8,609) size 136x76
- RenderBlock {DIV} at (0,601) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
- RenderBlock {DIV} at (13,53) size 25x25 [bgcolor=#ADD8E6]
-layer at (21,91) size 25x25
- RenderBlock (positioned) {DIV} at (21,91) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,66) size 25x25
- RenderBlock (positioned) {DIV} at (81,66) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,91) size 25x25
- RenderBlock (positioned) {DIV} at (81,91) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (21,177) size 25x25
- RenderBlock (positioned) {DIV} at (21,177) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,152) size 25x25
- RenderBlock (positioned) {DIV} at (81,152) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,177) size 25x25
- RenderBlock (positioned) {DIV} at (81,177) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (21,263) size 25x25
- RenderBlock (positioned) {DIV} at (21,263) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,238) size 25x25
- RenderBlock (positioned) {DIV} at (81,238) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,263) size 25x25
- RenderBlock (positioned) {DIV} at (81,263) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,324) size 25x25
- RenderBlock (positioned) {DIV} at (81,324) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,349) size 25x25
- RenderBlock (positioned) {DIV} at (81,349) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (83,412) size 25x25
- RenderBlock (positioned) {DIV} at (83,412) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,496) size 25x25
- RenderBlock (positioned) {DIV} at (81,496) size 25x25 [border: (3px solid #0000FF7F)]
-layer at (81,612) size 25x25
- RenderBlock (positioned) {DIV} at (81,612) size 25x25 [border: (3px solid #0000FF7F)]
</del><ins>+layer at (8,183) size 116x66
+ RenderBlock {DIV} at (0,130) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (8,48) size 25x25 [bgcolor=#ADD8E6]
+layer at (138,143) size 66x116
+ RenderBlock {DIV} at (130,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (8,8) size 25x0
+ RenderText {#text} at (33,8) size 75x25
+ text run at (33,8) width 25: "x"
+ text run at (58,8) width 25: "y"
+ text run at (83,8) width 25: "z"
+layer at (228,143) size 66x116
+ RenderBlock {DIV} at (220,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (8,8) size 25x0
+ RenderInline {SPAN} at (0,0) size 75x25
+ RenderText {#text} at (33,8) size 75x25
+ text run at (33,8) width 25: "x"
+ text run at (58,8) width 25: "y"
+ text run at (83,8) 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) size 75x48
+ RenderText {#text} at (0,0) size 75x25
+ 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) size 75x48
+ RenderBR {BR} at (0,0) size 25x0
+ 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) size 54x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
+ RenderFlexibleBox {DIV} at (0,0) size 25x25
+ RenderBlock {DIV} at (0,12) size 25x1
+ 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) 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)]
+ RenderBlock {DIV} at (48,8) size 25x25 [bgcolor=#ADD8E6]
+layer at (18,263) size 66x116
+ RenderBlock {DIV} at (10,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (8,8) size 25x0
+ RenderText {#text} at (33,8) size 75x25
+ text run at (33,8) width 25: "x"
+ text run at (58,8) width 25: "y"
+ text run at (83,8) width 25: "z"
+layer at (108,263) size 66x116
+ RenderBlock {DIV} at (100,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderBR {BR} at (8,8) size 25x0
+ RenderInline {SPAN} at (0,0) size 75x25
+ RenderText {#text} at (33,8) size 75x25
+ text run at (33,8) width 25: "x"
+ text run at (58,8) width 25: "y"
+ text run at (83,8) 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) size 75x48
+ RenderText {#text} at (0,0) size 75x25
+ 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) size 75x48
+ RenderBR {BR} at (0,0) size 25x0
+ 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) size 54x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
+ RenderFlexibleBox {DIV} at (0,0) size 25x25
+ RenderBlock {DIV} at (0,12) size 25x1
+ 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)]
+ RenderBlock (anonymous) at (8,8) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (33,8) 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)]
+ RenderBlock {DIV} at (48,8) size 25x25 [bgcolor=#ADD8E6]
+layer at (16,96) size 25x25
+ RenderBlock (positioned) {DIV} at (16,96) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (68,71) size 26x25
+ RenderBlock (positioned) {DIV} at (68,71) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (68,96) size 26x25
+ RenderBlock (positioned) {DIV} at (68,96) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (136,96) size 25x25
+ RenderBlock (positioned) {DIV} at (136,96) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (188,71) size 26x25
+ RenderBlock (positioned) {DIV} at (188,71) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (188,96) size 26x25
+ RenderBlock (positioned) {DIV} at (188,96) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (256,96) size 25x25
+ RenderBlock (positioned) {DIV} at (256,96) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (308,71) size 26x25
+ RenderBlock (positioned) {DIV} at (308,71) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (308,96) size 26x25
+ RenderBlock (positioned) {DIV} at (308,96) size 26x25 [border: (3px solid #0000FF7F)]
+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,376) size 25x25
+ RenderBlock (positioned) {DIV} at (26,376) 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 (115,376) size 25x25
+ RenderBlock (positioned) {DIV} at (115,376) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (140,323) size 25x26
+ RenderBlock (positioned) {DIV} at (140,323) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (115,323) size 25x26
+ RenderBlock (positioned) {DIV} at (115,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)]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolnewmulticolclientrectsexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastmulticolnewmulticolclientrectsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt (0 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/multicol/newmulticol/client-rects-expected.txt 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -0,0 +1,369 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x29
+ RenderText {#text} at (0,11) size 421x18
+ text run at (0,11) width 421: "The blue borders should coincide with light blue squares, like this: "
+ RenderBlock {SPAN} at (421,0) size 25x25 [bgcolor=#ADD8E6] [border: (3px solid #0000FF7F)]
+ RenderText {#text} at (446,11) size 196x18
+ text run at (446,11) width 8: ". "
+ text run at (454,11) width 188: "There should be none of this: "
+ RenderBlock {SPAN} at (642,0) size 25x25 [bgcolor=#ADD8E6]
+ RenderText {#text} at (667,11) size 51x18
+ text run at (667,11) width 4: " "
+ text run at (671,11) width 47: "or this: "
+ 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: " "
+ 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 (0,0) size 0x0
+layer at (8,63) size 116x66
+ RenderBlock {DIV} at (0,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (128,63) size 116x66
+ RenderBlock {DIV} at (120,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (248,63) size 116x66
+ RenderBlock {DIV} at (240,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (368,63) size 116x66
+ RenderBlock {DIV} at (360,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (488,63) size 116x66
+ RenderBlock {DIV} at (480,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (608,63) size 116x66
+ RenderBlock {DIV} at (600,10) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (8,183) size 116x66
+ RenderBlock {DIV} at (0,130) size 116x66 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 100x50
+layer at (138,143) size 66x116
+ RenderBlock {DIV} at (130,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (228,143) size 66x116
+ RenderBlock {DIV} at (220,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (318,143) size 66x116
+ RenderBlock {DIV} at (310,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (408,143) size 66x116
+ RenderBlock {DIV} at (400,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (498,143) size 66x116
+ RenderBlock {DIV} at (490,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (588,143) size 66x116
+ RenderBlock {DIV} at (580,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (678,143) size 66x116
+ RenderBlock {DIV} at (670,90) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (18,263) size 66x116
+ RenderBlock {DIV} at (10,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (108,263) size 66x116
+ RenderBlock {DIV} at (100,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (198,263) size 66x116
+ RenderBlock {DIV} at (190,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (288,263) size 66x116
+ RenderBlock {DIV} at (280,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (378,263) size 66x116
+ RenderBlock {DIV} at (370,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (468,263) size 66x116
+ RenderBlock {DIV} at (460,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (558,263) size 66x116
+ RenderBlock {DIV} at (550,210) size 66x116 [color=#ADD8E6] [border: (3px solid #000000)]
+ RenderMultiColumnSet at (8,8) size 50x100
+layer at (16,71) size 48x100
+ RenderMultiColumnFlowThread at (8,8) size 48x100
+ RenderBR {BR} at (0,0) size 0x25
+ RenderText {#text} at (0,25) size 25x75
+ text run at (0,25) width 25: "x"
+ text run at (0,50) width 25: "y"
+ text run at (0,75) width 25: "z"
+layer at (136,71) size 48x100
+ RenderMultiColumnFlowThread at (8,8) size 48x100
+ RenderBR {BR} at (0,0) size 0x25
+ RenderInline {SPAN} at (0,0) size 25x75
+ RenderText {#text} at (0,25) size 25x75
+ text run at (0,25) width 25: "x"
+ text run at (0,50) width 25: "y"
+ text run at (0,75) width 25: "z"
+ RenderText {#text} at (0,0) size 0x0
+layer at (256,71) size 48x100
+ RenderMultiColumnFlowThread at (8,8) size 48x100
+ RenderBlock (anonymous) at (0,0) size 48x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (0,25) size 48x75
+ RenderText {#text} at (0,0) size 25x75
+ text run at (0,0) width 25: "x"
+ text run at (0,25) width 25: "y"
+ text run at (0,50) width 25: "z"
+layer at (376,71) size 48x100
+ RenderMultiColumnFlowThread at (8,8) size 48x100
+ RenderBlock (anonymous) at (0,0) size 48x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (0,25) size 48x75
+ RenderBR {BR} at (0,0) size 0x25
+ RenderText {#text} at (0,25) size 25x50
+ text run at (0,25) width 25: "y"
+ text run at (0,50) width 25: "z"
+layer at (496,71) size 48x79
+ RenderMultiColumnFlowThread at (8,8) size 48x79
+ RenderBlock (anonymous) at (0,0) size 48x25
+ RenderBR {BR} at (0,0) size 0x25
+ RenderBlock {DIV} at (0,25) size 48x54
+ RenderBR {BR} at (0,0) size 0x25
+ RenderSlider {INPUT} at (2,27) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
+ RenderFlexibleBox {DIV} at (0,0) size 25x25
+ RenderBlock {DIV} at (0,12) size 25x1
+ RenderBlock {DIV} at (0,0) size 25x0
+layer at (616,71) 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 (16,191) size 48x65
+ RenderMultiColumnFlowThread at (8,8) size 48x65
+ RenderBlock {DIV} at (0,40) size 25x25 [bgcolor=#ADD8E6]
+layer at (146,151) 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 (236,151) size 100x48
+ RenderMultiColumnFlowThread at (8,8) size 100x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderInline {SPAN} at (0,0) size 75x25
+ 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"
+ RenderText {#text} at (0,0) size 0x0
+layer at (326,151) size 100x48
+ RenderMultiColumnFlowThread at (8,8) size 100x48
+ RenderBlock (anonymous) at (0,0) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (25,0) size 75x48
+ RenderText {#text} at (0,0) size 75x25
+ 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 (416,151) size 100x48
+ RenderMultiColumnFlowThread at (8,8) size 100x48
+ RenderBlock (anonymous) at (0,0) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (25,0) size 75x48
+ RenderBR {BR} at (0,0) size 25x0
+ 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 (506,151) size 79x48
+ RenderMultiColumnFlowThread at (8,8) size 79x48
+ RenderBlock (anonymous) at (0,0) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (25,0) size 54x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
+ RenderFlexibleBox {DIV} at (0,0) size 25x25
+ RenderBlock {DIV} at (0,12) size 25x1
+ RenderBlock {DIV} at (0,0) size 25x0
+layer at (596,151) 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 (686,151) size 65x48
+ RenderMultiColumnFlowThread at (8,8) size 65x48
+ RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
+layer at (-24,271) 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 (66,271) size 100x48
+ RenderMultiColumnFlowThread at (8,8) size 100x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderInline {SPAN} at (0,0) size 75x25
+ 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"
+ RenderText {#text} at (0,0) size 0x0
+layer at (156,271) size 100x48
+ RenderMultiColumnFlowThread at (8,8) size 100x48
+ RenderBlock (anonymous) at (0,0) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (25,0) size 75x48
+ RenderText {#text} at (0,0) size 75x25
+ 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 (246,271) size 100x48
+ RenderMultiColumnFlowThread at (8,8) size 100x48
+ RenderBlock (anonymous) at (0,0) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (25,0) size 75x48
+ RenderBR {BR} at (0,0) size 25x0
+ 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 (357,271) size 79x48
+ RenderMultiColumnFlowThread at (8,8) size 79x48
+ RenderBlock (anonymous) at (0,0) size 25x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderBlock {DIV} at (25,0) size 54x48
+ RenderBR {BR} at (0,0) size 25x0
+ RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
+ RenderFlexibleBox {DIV} at (0,0) size 25x25
+ RenderBlock {DIV} at (0,12) size 25x1
+ RenderBlock {DIV} at (0,0) size 25x0
+layer at (451,271) 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 (551,271) size 65x48
+ RenderMultiColumnFlowThread at (8,8) size 65x48
+ RenderBlock {DIV} at (40,0) size 25x25 [bgcolor=#ADD8E6]
+layer at (16,96) size 25x25
+ RenderBlock (positioned) {DIV} at (16,96) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (68,71) size 26x25
+ RenderBlock (positioned) {DIV} at (68,71) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (68,96) size 26x25
+ RenderBlock (positioned) {DIV} at (68,96) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (136,96) size 25x25
+ RenderBlock (positioned) {DIV} at (136,96) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (188,71) size 26x25
+ RenderBlock (positioned) {DIV} at (188,71) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (188,96) size 26x25
+ RenderBlock (positioned) {DIV} at (188,96) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (256,96) size 25x25
+ RenderBlock (positioned) {DIV} at (256,96) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (308,71) size 26x25
+ RenderBlock (positioned) {DIV} at (308,71) size 26x25 [border: (3px solid #0000FF7F)]
+layer at (308,96) size 26x25
+ RenderBlock (positioned) {DIV} at (308,96) size 26x25 [border: (3px solid #0000FF7F)]
+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 (115,271) size 25x25
+ RenderBlock (positioned) {DIV} at (115,271) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (140,323) size 25x26
+ RenderBlock (positioned) {DIV} at (140,323) size 25x26 [border: (3px solid #0000FF7F)]
+layer at (115,323) size 25x26
+ RenderBlock (positioned) {DIV} at (115,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)]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/ChangeLog 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-03-20 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] getClientRects returns wrong rectangle
+ https://bugs.webkit.org/show_bug.cgi?id=128614
+
+ Reviewed by Sam Weinig.
+
+ Added fast/multicol/newmulticol/client-rects.html and beefed up existing
+ fast/multicol/client-rects.html to use more writing modes.
+
+ * rendering/LayoutState.h:
+ Removed unused function.
+
+ * rendering/RenderFlowThread.h:
+ Make mapFlowToRegion virtual so that RenderMultiColumnFlowThread can
+ override it.
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::mapFromFlowToRegion):
+ * rendering/RenderMultiColumnFlowThread.h:
+ Implement mapFlowToRegion to correctly translate a flow thread position
+ into a column offset within a region.
+
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::columnTranslationForOffset):
+ (WebCore::RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect):
+ * rendering/RenderMultiColumnSet.h:
+ Refactored some code to make a columnTranslationForOffset helper that
+ can be used by RenderMultiColumnFlowThread.
+
</ins><span class="cx"> 2014-03-20 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Preserve original document URL for XSSAuditor reports
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.h (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.h 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/rendering/LayoutState.h 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -99,8 +99,6 @@
</span><span class="cx"> void propagateLineGridInfo(RenderBox*);
</span><span class="cx"> void establishLineGrid(RenderBlockFlow*);
</span><span class="cx">
</span><del>- void computeLineGridPaginationOrigin(RenderBox*);
-
</del><span class="cx"> public:
</span><span class="cx"> // Do not add anything apart from bitfields until after m_columnInfo. See https://bugs.webkit.org/show_bug.cgi?id=100173
</span><span class="cx"> bool m_clipped : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; }
</span><span class="cx"> bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }
</span><span class="cx">
</span><del>- RenderRegion* mapFromFlowToRegion(TransformState&) const;
</del><ins>+ virtual RenderRegion* mapFromFlowToRegion(TransformState&) const;
</ins><span class="cx">
</span><span class="cx"> void removeRenderBoxRegionInfo(RenderBox*);
</span><span class="cx"> void logicalWidthChangedInRegionsForBlock(const RenderBlock*, bool&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LayoutState.h"
</span><span class="cx"> #include "RenderMultiColumnSet.h"
</span><ins>+#include "TransformState.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -173,4 +174,41 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderRegion* RenderMultiColumnFlowThread::mapFromFlowToRegion(TransformState& transformState) const
+{
+ if (!hasValidRegionInfo())
+ return nullptr;
+
+ // Get back into our local flow thread space.
+ LayoutRect boxRect = transformState.mappedQuad().enclosingBoundingBox();
+ flipForWritingMode(boxRect);
+
+ // FIXME: We need to refactor RenderObject::absoluteQuads to be able to split the quads across regions,
+ // for now we just take the center of the mapped enclosing box and map it to a column.
+ LayoutPoint center = boxRect.center();
+ LayoutUnit centerOffset = isHorizontalWritingMode() ? center.y() : center.x();
+ RenderRegion* renderRegion = const_cast<RenderMultiColumnFlowThread*>(this)->regionAtBlockOffset(this, centerOffset, true, DisallowRegionAutoGeneration);
+ if (!renderRegion)
+ return nullptr;
+
+ // Now that we know which multicolumn set we hit, we need to get the appropriate translation offset for the column.
+ RenderMultiColumnSet* columnSet = toRenderMultiColumnSet(renderRegion);
+ LayoutPoint translationOffset = columnSet->columnTranslationForOffset(centerOffset);
+
+ // Now we know how we want the rect to be translated into the region.
+ LayoutRect flippedRegionRect(renderRegion->flowThreadPortionRect());
+ if (isHorizontalWritingMode())
+ flippedRegionRect.setHeight(columnSet->computedColumnHeight());
+ else
+ flippedRegionRect.setWidth(columnSet->computedColumnHeight());
+ flipForWritingMode(flippedRegionRect);
+
+ flippedRegionRect.moveBy(-translationOffset);
+
+ // There is an additional offset to apply, which is the offset of the region within the multi-column space.
+ transformState.move(renderRegion->contentBoxRect().location() - flippedRegionRect.location());
+
+ return renderRegion;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void computeLineGridPaginationOrigin(LayoutState&) const override;
</span><span class="cx">
</span><ins>+ virtual RenderRegion* mapFromFlowToRegion(TransformState&) const override;
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual const char* renderName() const override;
</span><span class="cx"> virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -655,10 +655,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint& layerOffset, LayoutRect& regionBounds)
</del><ins>+LayoutPoint RenderMultiColumnSet::columnTranslationForOffset(const LayoutUnit& offset) const
</ins><span class="cx"> {
</span><del>- LayoutUnit layerLogicalTop = isHorizontalWritingMode() ? layerOffset.y() : layerOffset.x();
- unsigned startColumn = columnIndexAtOffset(layerLogicalTop);
</del><ins>+ unsigned startColumn = columnIndexAtOffset(offset);
</ins><span class="cx">
</span><span class="cx"> LayoutUnit colGap = columnGap();
</span><span class="cx"> LayoutUnit colLogicalWidth = computedColumnWidth();
</span><span class="lines">@@ -694,13 +693,17 @@
</span><span class="cx">
</span><span class="cx"> if (!isHorizontalWritingMode())
</span><span class="cx"> translationOffset = translationOffset.transposedPoint();
</span><del>-
</del><ins>+
</ins><span class="cx"> // FIXME: The translation needs to include the multicolumn set's content offset within the
</span><span class="cx"> // multicolumn block as well. This won't be an issue until we start creating multiple multicolumn sets.
</span><del>-
- regionBounds.moveBy(roundedIntPoint(-translationOffset));
</del><ins>+ return translationOffset;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint& layerOffset, LayoutRect& regionBounds)
+{
+ regionBounds.moveBy(roundedIntPoint(-columnTranslationForOffset(isHorizontalWritingMode() ? layerOffset.y() : layerOffset.x())));
+}
+
</ins><span class="cx"> void RenderMultiColumnSet::addOverflowFromChildren()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Need to do much better here.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (165990 => 165991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2014-03-20 20:03:49 UTC (rev 165990)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2014-03-20 20:26:28 UTC (rev 165991)
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx">
</span><span class="cx"> void prepareForLayout();
</span><span class="cx">
</span><ins>+ LayoutPoint columnTranslationForOffset(const LayoutUnit&) const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> void addOverflowFromChildren() override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>