<!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>[202856] 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/202856">202856</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-07-06 06:02:43 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Height percentages are not properly resolved for item's children
https://bugs.webkit.org/show_bug.cgi?id=159258
Reviewed by Sergio Villar Senin.
Source/WebCore:
When grid items are vertically stretched (default behavior)
they store their height on RenderBox::overrideLogicalContentHeight().
In order to resolve the percentage height on the grid item's children
we need to use that size.
Test: fast/css-grid-layout/percent-resolution-grid-item-children.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computePercentageLogicalHeight):
LayoutTests:
* fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt: Added.
* fast/css-grid-layout/percent-resolution-grid-item-children.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemchildrenexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemchildrenhtml">trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202855 => 202856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-07-06 11:32:07 UTC (rev 202855)
+++ trunk/LayoutTests/ChangeLog        2016-07-06 13:02:43 UTC (rev 202856)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-06 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Height percentages are not properly resolved for item's children
+ https://bugs.webkit.org/show_bug.cgi?id=159258
+
+ Reviewed by Sergio Villar Senin.
+
+ * fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt: Added.
+ * fast/css-grid-layout/percent-resolution-grid-item-children.html: Added.
+
</ins><span class="cx"> 2016-07-05 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebasing tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemchildrenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt (0 => 202856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children-expected.txt        2016-07-06 13:02:43 UTC (rev 202856)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+This test checks that percentages are properly resolved for grid items' children.
+
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemchildrenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children.html (0 => 202856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children.html         (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item-children.html        2016-07-06 13:02:43 UTC (rev 202856)
</span><span class="lines">@@ -0,0 +1,143 @@
</span><ins>+<!DOCTYPE html>
+<link href="resources/grid.css" rel="stylesheet">
+<link href="resources/grid-alignment.css" rel="stylesheet">
+<style>
+
+.grid {
+ grid: 100px / 200px;
+ position: relative;
+}
+
+.fixedSize350 {
+ width: 350px;
+ height: 350px;
+}
+
+.percentSize100 {
+ width: 100%;
+ height: 100%;
+}
+
+.percentSize50 {
+ width: 50%;
+ height: 50%;
+}
+
+.positioned {
+ position: absolute;
+ grid-column: 1 / 2;
+ grid-row: 1 / 2;
+}
+
+.offsets {
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+}
+
+</style>
+<script src="../../resources/check-layout.js"></script>
+<body onload="checkLayout('.grid')">
+
+<p>This test checks that percentages are properly resolved for grid items' children.</p>
+
+<div class="grid">
+ <div data-expected-width="200" data-expected-height="100">
+ <div class="percentSize100" data-expected-width="200" data-expected-height="100">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div data-expected-width="200" data-expected-height="100">
+ <div class="percentSize50" data-expected-width="100" data-expected-height="50">
+ </div>
+ </div>
+</div>
+
+<div class="grid itemsStart">
+ <div data-expected-width="0" data-expected-height="0">
+ <div class="percentSize100" data-expected-width="0" data-expected-height="0">
+ </div>
+ </div>
+</div>
+
+<div class="grid itemsStart">
+ <div data-expected-width="0" data-expected-height="0">
+ <div class="percentSize50" data-expected-width="0" data-expected-height="0">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="fixedSize350" data-expected-width="350" data-expected-height="350">
+ <div class="percentSize100" data-expected-width="350" data-expected-height="350">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="fixedSize350" data-expected-width="350" data-expected-height="350">
+ <div class="percentSize50" data-expected-width="175" data-expected-height="175">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="percentSize100" data-expected-width="200" data-expected-height="100">
+ <div class="percentSize100" data-expected-width="200" data-expected-height="100">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="percentSize100" data-expected-width="200" data-expected-height="100">
+ <div class="percentSize50" data-expected-width="100" data-expected-height="50">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="percentSize50" data-expected-width="100" data-expected-height="50">
+ <div class="percentSize100" data-expected-width="100" data-expected-height="50">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="percentSize50" data-expected-width="100" data-expected-height="50">
+ <div class="percentSize50" data-expected-width="50" data-expected-height="25">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="positioned" data-expected-width="0" data-expected-height="0">
+ <div class="percentSize100" data-expected-width="0" data-expected-height="0">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="positioned" data-expected-width="0" data-expected-height="0">
+ <div class="percentSize50" data-expected-width="0" data-expected-height="0">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="positioned offsets" data-expected-width="200" data-expected-height="100">
+ <div class="percentSize100" data-expected-width="200" data-expected-height="100">
+ </div>
+ </div>
+</div>
+
+<div class="grid">
+ <div class="positioned offsets" data-expected-width="200" data-expected-height="100">
+ <div class="percentSize50" data-expected-width="100" data-expected-height="50">
+ </div>
+ </div>
+</div>
+
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202855 => 202856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-06 11:32:07 UTC (rev 202855)
+++ trunk/Source/WebCore/ChangeLog        2016-07-06 13:02:43 UTC (rev 202856)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-06 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Height percentages are not properly resolved for item's children
+ https://bugs.webkit.org/show_bug.cgi?id=159258
+
+ Reviewed by Sergio Villar Senin.
+
+ When grid items are vertically stretched (default behavior)
+ they store their height on RenderBox::overrideLogicalContentHeight().
+ In order to resolve the percentage height on the grid item's children
+ we need to use that size.
+
+ Test: fast/css-grid-layout/percent-resolution-grid-item-children.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+
</ins><span class="cx"> 2016-07-06 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Better guard TextureMapper header and CMake includes
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (202855 => 202856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp        2016-07-06 11:32:07 UTC (rev 202855)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2016-07-06 13:02:43 UTC (rev 202856)
</span><span class="lines">@@ -2989,6 +2989,8 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> else if (hasOverrideContainingBlockLogicalHeight())
</span><span class="cx"> availableHeight = overrideContainingBlockContentLogicalHeight();
</span><ins>+ else if (cb->isGridItem() && cb->hasOverrideLogicalContentHeight())
+ availableHeight = cb->overrideLogicalContentHeight();
</ins><span class="cx"> #endif
</span><span class="cx"> else if (is<RenderTableCell>(*cb)) {
</span><span class="cx"> if (!skippedAutoHeightContainingBlock) {
</span></span></pre>
</div>
</div>
</body>
</html>