<!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>[199153] 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/199153">199153</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2016-04-07 03:23:53 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Content box incorrectly used as non-auto min-height
https://bugs.webkit.org/show_bug.cgi?id=155946
Reviewed by Antti Koivisto.
Source/WebCore:
When computing the minimum height value of grid items with
non-auto min-height we used to return the size of the content
box meaning that borders and paddings were incorrectly
ignored.
Note that we're also ignoring margins, but as that is a
problem also for widths it'll be fixed in a follow up patch.
Test: fast/css-grid-layout/min-height-border-box.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::minSizeForChild):
LayoutTests:
* fast/css-grid-layout/min-height-border-box-expected.txt: Added.
* fast/css-grid-layout/min-height-border-box.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="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminheightborderboxexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/min-height-border-box-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminheightborderboxhtml">trunk/LayoutTests/fast/css-grid-layout/min-height-border-box.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199152 => 199153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-07 10:21:25 UTC (rev 199152)
+++ trunk/LayoutTests/ChangeLog 2016-04-07 10:23:53 UTC (rev 199153)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-07 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Content box incorrectly used as non-auto min-height
+ https://bugs.webkit.org/show_bug.cgi?id=155946
+
+ Reviewed by Antti Koivisto.
+
+ * fast/css-grid-layout/min-height-border-box-expected.txt: Added.
+ * fast/css-grid-layout/min-height-border-box.html: Added.
+
</ins><span class="cx"> 2016-04-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Reverting previous due to bad LayoutTest ChangeLog.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminheightborderboxexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/min-height-border-box-expected.txt (0 => 199153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/min-height-border-box-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/min-height-border-box-expected.txt 2016-04-07 10:23:53 UTC (rev 199153)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+min-height: auto. grid height: auto
+
+XXXX
+PASS
+XXX
+PASS
+min-height: 0px. grid height: auto
+
+XXXX
+PASS
+XXX
+PASS
+NO STRETCH min-height: 0px. grid height: auto
+
+XXXX
+PASS
+XXX
+PASS
+min-height: 0px. grid height: 15px
+
+XXXX
+PASS
+XXX
+PASS
+NO STRETCH min-height: 0px. grid height: 15px
+
+XXXX
+PASS
+XXX
+PASS
+min-height: 30px. grid height: auto
+
+XXXX
+PASS
+XXX
+PASS
+NO STRETCH min-height: 30px. grid height: auto
+
+XXXX
+PASS
+XXX
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminheightborderboxhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/min-height-border-box.html (0 => 199153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/min-height-border-box.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/min-height-border-box.html 2016-04-07 10:23:53 UTC (rev 199153)
</span><span class="lines">@@ -0,0 +1,120 @@
</span><ins>+<!DOCTYPE html>
+<link href="resources/grid.css" rel="stylesheet">
+<link href="resources/grid-alignment.css" rel="stylesheet">
+<style>
+.grid {
+ border: 5px solid magenta;
+ margin-bottom: 25px;
+ -webkit-grid-template-rows: minmax(auto, 0px);
+}
+
+.item {
+ font: 25px/1 Ahem;
+}
+
+.container { width: 150px; }
+.borderPadding {
+ border-width: 2px 3px 5px 9px;
+ border-color: blue;
+ border-style: solid;
+ padding: 4px 9px 12px 20px;
+}
+
+</style>
+
+<script src="../../resources/check-layout.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<h3>min-height: auto. grid height: auto</h3>
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="35">
+ <div class="item" data-expected-width="140" data-expected-height="25">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="58">
+ <div class="item borderPadding" data-expected-width="140" data-expected-height="48">XXX</div>
+ </div>
+</div>
+
+<h3>min-height: 0px. grid height: auto</h3>
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="10">
+ <div class="item" style="min-height: 0px;" data-expected-width="140" data-expected-height="0">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="33">
+ <div class="item borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="23">XXX</div>
+ </div>
+</div>
+
+<h3>NO STRETCH min-height: 0px. grid height: auto</h3>
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="10">
+ <div class="item alignSelfStart" style="min-height: 0px;" data-expected-width="140" data-expected-height="25">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="33">
+ <div class="item alignSelfStart borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="48">XXX</div>
+ </div>
+</div>
+
+<h3>min-height: 0px. grid height: 15px</h3>
+<div class="container">
+ <div class="grid" style="height: 15px;" data-expected-width="150" data-expected-height="25">
+ <div class="item" style="min-height: 0px;" data-expected-width="140" data-expected-height="0">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" style="height: 15px;" data-expected-width="150" data-expected-height="25">
+ <div class="item borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="23">XXX</div>
+ </div>
+</div>
+
+<h3>NO STRETCH min-height: 0px. grid height: 15px</h3>
+<div class="container">
+ <div class="grid" style="height: 15px;" data-expected-width="150" data-expected-height="25">
+ <div class="item alignSelfStart" style="min-height: 0px;" data-expected-width="140" data-expected-height="25">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" style="height: 15px;" data-expected-width="150" data-expected-height="25">
+ <div class="item alignSelfStart borderPadding" style="min-height: 0px;" data-expected-width="140" data-expected-height="48">XXX</div>
+ </div>
+</div>
+
+<h3>min-height: 30px. grid height: auto</h3>
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="40">
+ <div class="item" style="min-height: 30px;" data-expected-width="140" data-expected-height="30">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="63">
+ <div class="item borderPadding" style="min-height: 30px;" data-expected-width="140" data-expected-height="53">XXX</div>
+ </div>
+</div>
+
+<h3>NO STRETCH min-height: 30px. grid height: auto</h3>
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="40">
+ <div class="item alignSelfStart" style="min-height: 30px;" data-expected-width="140" data-expected-height="30">XXXX</div>
+ </div>
+</div>
+
+<div class="container">
+ <div class="grid" data-expected-width="150" data-expected-height="63">
+ <div class="item alignSelfStart borderPadding" style="min-height: 30px;" data-expected-width="140" data-expected-height="53">XXX</div>
+ </div>
+</div>
+
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199152 => 199153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-07 10:21:25 UTC (rev 199152)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 10:23:53 UTC (rev 199153)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-04-07 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Content box incorrectly used as non-auto min-height
+ https://bugs.webkit.org/show_bug.cgi?id=155946
+
+ Reviewed by Antti Koivisto.
+
+ When computing the minimum height value of grid items with
+ non-auto min-height we used to return the size of the content
+ box meaning that borders and paddings were incorrectly
+ ignored.
+
+ Note that we're also ignoring margins, but as that is a
+ problem also for widths it'll be fixed in a follow up patch.
+
+ Test: fast/css-grid-layout/min-height-border-box.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::minSizeForChild):
+
</ins><span class="cx"> 2016-04-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Reverting previous due to bad LayoutTest ChangeLog.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (199152 => 199153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-04-07 10:21:25 UTC (rev 199152)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-04-07 10:23:53 UTC (rev 199153)
</span><span class="lines">@@ -750,7 +750,7 @@
</span><span class="cx"> if (isRowAxis)
</span><span class="cx"> return child.computeLogicalWidthInRegionUsing(MinSize, childMinSize, contentLogicalWidth(), *this, nullptr);
</span><span class="cx">
</span><del>- return child.computeContentAndScrollbarLogicalHeightUsing(MinSize, childMinSize, child.logicalHeight()).valueOr(0);
</del><ins>+ return child.computeLogicalHeightUsing(MinSize, childMinSize, Nullopt).valueOr(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderGrid::minContentForChild(RenderBox& child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
</span></span></pre>
</div>
</div>
</body>
</html>