<!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>[168288] 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/168288">168288</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-05-05 09:14:47 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Elements with overflow:auto are not painted inside regions when following a float
https://bugs.webkit.org/show_bug.cgi?id=131161
Reviewed by David Hyatt.
Source/WebCore:
When a float-avoiding element (such as overflow:auto) is flowed into a flow thread after a float, its
logical left is not set on its frameRect or its layer's topLeft, but is instead kept in its RenderBoxRegionInfo
structure. In some situation, this causes paint rejection to kick-in because intersecting the layer's rect
(which DOESN'T contain the logical left from the region info object) with the computed background rect
(which contains the logical left from the region info object) results in an empty rect.
Test: fast/regions/overflow-auto-after-float.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
LayoutTests:
Added test for an overflow:auto element being flowed after a float.
* fast/regions/overflow-auto-after-float-expected.html: Added.
* fast/regions/overflow-auto-after-float.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsoverflowautoafterfloatexpectedhtml">trunk/LayoutTests/fast/regions/overflow-auto-after-float-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsoverflowautoafterfloathtml">trunk/LayoutTests/fast/regions/overflow-auto-after-float.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168287 => 168288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-05 14:51:48 UTC (rev 168287)
+++ trunk/LayoutTests/ChangeLog 2014-05-05 16:14:47 UTC (rev 168288)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-05 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Elements with overflow:auto are not painted inside regions when following a float
+ https://bugs.webkit.org/show_bug.cgi?id=131161
+
+ Reviewed by David Hyatt.
+
+ Added test for an overflow:auto element being flowed after a float.
+
+ * fast/regions/overflow-auto-after-float-expected.html: Added.
+ * fast/regions/overflow-auto-after-float.html: Added.
+
</ins><span class="cx"> 2014-05-05 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Slider displayed wrong in regions
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsoverflowautoafterfloatexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/overflow-auto-after-float-expected.html (0 => 168288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/overflow-auto-after-float-expected.html (rev 0)
+++ trunk/LayoutTests/fast/regions/overflow-auto-after-float-expected.html 2014-05-05 16:14:47 UTC (rev 168288)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <style>
+ .region {
+ width: 350px;
+ height: 150px;
+ border: thin solid black;
+ padding: 10px;
+ }
+
+ #float {
+ width: 150px;
+ height: 50px;
+ background-color: green;
+ color: white;
+ float: left;
+ }
+
+ #after {
+ width: 150px;
+ height: 100px;
+ background-color: blue;
+ color: white;
+ overflow: auto;
+ position: relative;
+ }
+ </style>
+ </head>
+
+ <body>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=131161">Bug 131161 - [CSS Regions] Elements with overflow:auto are not painted inside regions when following a float</a>
+ <p>A <span style="color:blue"><b>blue</b></span> div should be visible next to <span style="color:green"><b>green</b></span> float.</p>
+
+ <div class="region">
+ <div id="float">This is a FLOAT</div>
+ <div id="after">This box has OVERFLOW:AUTO</div>
+ </div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsoverflowautoafterfloathtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/overflow-auto-after-float.html (0 => 168288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/overflow-auto-after-float.html (rev 0)
+++ trunk/LayoutTests/fast/regions/overflow-auto-after-float.html 2014-05-05 16:14:47 UTC (rev 168288)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <style>
+ .region {
+ width: 350px;
+ height: 150px;
+ border: thin solid black;
+ padding: 10px;
+ -webkit-flow-from: flow;
+ }
+
+ #float {
+ width: 150px;
+ height: 50px;
+ background-color: green;
+ color: white;
+ float: left;
+ }
+
+ #after {
+ width: 150px;
+ height: 100px;
+ background-color: blue;
+ color: white;
+ overflow: auto;
+ position: relative;
+ }
+
+ .flow {
+ -webkit-flow-into: flow;
+ }
+ </style>
+ </head>
+
+ <body>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=131161">Bug 131161 - [CSS Regions] Elements with overflow:auto are not painted inside regions when following a float</a>
+ <p>A <span style="color:blue"><b>blue</b></span> div should be visible next to <span style="color:green"><b>green</b></span> float.</p>
+
+ <div class="region"></div>
+
+ <div id="float" class="flow">This is a FLOAT</div>
+ <div id="after" class="flow">This box has OVERFLOW:AUTO</div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168287 => 168288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-05 14:51:48 UTC (rev 168287)
+++ trunk/Source/WebCore/ChangeLog 2014-05-05 16:14:47 UTC (rev 168288)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-05 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Elements with overflow:auto are not painted inside regions when following a float
+ https://bugs.webkit.org/show_bug.cgi?id=131161
+
+ Reviewed by David Hyatt.
+
+ When a float-avoiding element (such as overflow:auto) is flowed into a flow thread after a float, its
+ logical left is not set on its frameRect or its layer's topLeft, but is instead kept in its RenderBoxRegionInfo
+ structure. In some situation, this causes paint rejection to kick-in because intersecting the layer's rect
+ (which DOESN'T contain the logical left from the region info object) with the computed background rect
+ (which contains the logical left from the region info object) results in an empty rect.
+
+ Test: fast/regions/overflow-auto-after-float.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+
</ins><span class="cx"> 2014-05-05 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Slider displayed wrong in regions
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (168287 => 168288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-05 14:51:48 UTC (rev 168287)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-05 16:14:47 UTC (rev 168288)
</span><span class="lines">@@ -5643,6 +5643,18 @@
</span><span class="cx"> bounds.moveBy(offset);
</span><span class="cx"> if (this != clipRectsContext.rootLayer || clipRectsContext.respectOverflowClip == RespectOverflowClip)
</span><span class="cx"> backgroundRect.intersect(bounds);
</span><ins>+
+ // Boxes inside flow threads don't have their logical left computed to avoid
+ // floats. Instead, that information is kept in their RenderBoxRegionInfo structure.
+ // As such, the layer bounds must be enlarged to encompass their background rect
+ // to ensure intersecting them won't result in an empty rect, which would eventually
+ // cause paint rejection.
+ if (flowThread && flowThread->isRenderNamedFlowThread()) {
+ if (flowThread->style().isHorizontalWritingMode())
+ layerBounds.shiftMaxXEdgeTo(std::max(layerBounds.maxX(), backgroundRect.rect().maxX()));
+ else
+ layerBounds.shiftMaxYEdgeTo(std::max(layerBounds.maxY(), backgroundRect.rect().maxY()));
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>