<!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>[163873] 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/163873">163873</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-02-11 08:12:08 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Overflow above the first region is not properly painted for regions with padding
https://bugs.webkit.org/show_bug.cgi?id=128590
Reviewed by Andrei Bucur.
Source/WebCore:
Painting is done using the layer of the region's container, so offsetting using the content box
of the region itself is incorrect.
Test: fast/regions/region-padding-overflow-hidden.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::regionContainer):
(WebCore::RenderRegion::regionContainerLayer):
* rendering/RenderRegion.h:
LayoutTests:
Added test for the correct painting of overflow above the first region
when the region has padding.
* fast/regions/region-padding-overflow-hidden-expected.html: Added.
* fast/regions/region-padding-overflow-hidden.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>
<li><a href="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegionh">trunk/Source/WebCore/rendering/RenderRegion.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsregionpaddingoverflowhiddenexpectedhtml">trunk/LayoutTests/fast/regions/region-padding-overflow-hidden-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsregionpaddingoverflowhiddenhtml">trunk/LayoutTests/fast/regions/region-padding-overflow-hidden.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163872 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-11 10:21:12 UTC (rev 163872)
+++ trunk/LayoutTests/ChangeLog 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-11 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Overflow above the first region is not properly painted for regions with padding
+ https://bugs.webkit.org/show_bug.cgi?id=128590
+
+ Reviewed by Andrei Bucur.
+
+ Added test for the correct painting of overflow above the first region
+ when the region has padding.
+
+ * fast/regions/region-padding-overflow-hidden-expected.html: Added.
+ * fast/regions/region-padding-overflow-hidden.html: Added.
+
</ins><span class="cx"> 2014-02-11 Piotr Grad <p.grad@samsung.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] High playback rate causes crash
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsregionpaddingoverflowhiddenexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/region-padding-overflow-hidden-expected.html (0 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/region-padding-overflow-hidden-expected.html (rev 0)
+++ trunk/LayoutTests/fast/regions/region-padding-overflow-hidden-expected.html 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+ #region {
+ border: 5px solid blue;
+ width: 200px;
+ height: 100px;
+ padding: 80px;
+ margin: 50px;
+ overflow: hidden;
+ }
+
+ #content {
+ background-color: lightgrey;
+ width: 200px;
+ height: 100px;
+ }
+</style>
+
+<body>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=128590">[CSS Regions] Overflow above the first region is not properly painted for regions with padding</a>
+
+ <div id="region">
+ <div id="content">
+ <div style="position:relative; top: -40px; color:red">This line should be visible</div>
+ <div>The red line above this one should be visible</div>
+ </div>
+ </div>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsregionpaddingoverflowhiddenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/region-padding-overflow-hidden.html (0 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/region-padding-overflow-hidden.html (rev 0)
+++ trunk/LayoutTests/fast/regions/region-padding-overflow-hidden.html 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+ #region {
+ -webkit-flow-from: flow;
+ border: 5px solid blue;
+ width: 200px;
+ height: 100px;
+ padding: 80px;
+ margin: 50px;
+ overflow: hidden;
+ }
+
+ #content {
+ -webkit-flow-into: flow;
+ background-color: lightgrey;
+ width: 200px;
+ height: 100px;
+ }
+</style>
+
+<body>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=128590">[CSS Regions] Overflow above the first region is not properly painted for regions with padding</a>
+
+ <div id="region"></div>
+
+ <div id="content">
+ <div style="position:relative; top: -40px; color:red">This line should be visible</div>
+ <div>The red line above this one should be visible</div>
+ </div>
+</body>
</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 (163872 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-11 10:21:12 UTC (rev 163872)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-11 Radu Stavila <stavila@adobe.com>
+
+ [CSS Regions] Overflow above the first region is not properly painted for regions with padding
+ https://bugs.webkit.org/show_bug.cgi?id=128590
+
+ Reviewed by Andrei Bucur.
+
+ Painting is done using the layer of the region's container, so offsetting using the content box
+ of the region itself is incorrect.
+
+ Test: fast/regions/region-padding-overflow-hidden.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::regionContainer):
+ (WebCore::RenderRegion::regionContainerLayer):
+ * rendering/RenderRegion.h:
+
</ins><span class="cx"> 2014-02-11 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> querySelector() does not use the compiler correctly
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (163872 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-11 10:21:12 UTC (rev 163872)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -5247,7 +5247,7 @@
</span><span class="cx"> LayoutRect flowThreadPortionRect = region->flowThreadPortionRect();
</span><span class="cx">
</span><span class="cx"> LayoutPoint portionLocation = flowThreadPortionRect.location();
</span><del>- LayoutRect regionContentBox = region->contentBoxRect();
</del><ins>+ LayoutRect regionContentBox = region->regionContainer()->contentBoxRect();
</ins><span class="cx"> LayoutSize moveOffset = portionLocation - regionContentBox.location();
</span><span class="cx">
</span><span class="cx"> ClipRect newOverflowClipRect = clipRects.overflowClipRect();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (163872 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-02-11 10:21:12 UTC (rev 163872)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -150,12 +150,17 @@
</span><span class="cx"> return portionLocation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderLayer* RenderRegion::regionContainerLayer() const
</del><ins>+RenderBlockFlow* RenderRegion::regionContainer() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer());
</span><del>- return toRenderBlockFlow(parent())->layer();
</del><ins>+ return toRenderBlockFlow(parent());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderLayer* RenderRegion::regionContainerLayer() const
+{
+ return regionContainer()->layer();
+}
+
</ins><span class="cx"> LayoutRect RenderRegion::overflowRectForFlowThreadPortion(const LayoutRect& flowThreadPortionRect, bool isFirstPortion, bool isLastPortion, OverflowType overflowType)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isValid());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.h (163872 => 163873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.h 2014-02-11 10:21:12 UTC (rev 163872)
+++ trunk/Source/WebCore/rendering/RenderRegion.h 2014-02-11 16:12:08 UTC (rev 163873)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutPoint flowThreadPortionLocation() const;
</span><span class="cx">
</span><ins>+ RenderBlockFlow* regionContainer() const;
</ins><span class="cx"> RenderLayer* regionContainerLayer() const;
</span><span class="cx">
</span><span class="cx"> virtual void attachRegion();
</span></span></pre>
</div>
</div>
</body>
</html>