<!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>[194030] 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/194030">194030</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-14 02:06:08 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Fix height computation of grid items with borders
https://bugs.webkit.org/show_bug.cgi?id=151800
Reviewed by Darin Adler.
Source/WebCore:
When computing the logical height of grid items for the
default "min-height: auto;" case we were constraning the
min-content size using constrainLogicalHeightByMinMax()
instead of constrainContentLogicalHeightByMinMax(). The
problem of using the former is that we were adding the borders
twice.
Test: fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalHeight):
LayoutTests:
* fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt: Added.
* fast/css-grid-layout/grid-item-with-border-in-intrinsic.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="#trunkLayoutTestsfastcssgridlayoutgriditemwithborderinintrinsicexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemwithborderinintrinsichtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194029 => 194030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-14 07:24:01 UTC (rev 194029)
+++ trunk/LayoutTests/ChangeLog 2015-12-14 10:06:08 UTC (rev 194030)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-12-14 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Fix height computation of grid items with borders
+ https://bugs.webkit.org/show_bug.cgi?id=151800
+
+ Reviewed by Darin Adler.
+
+ * fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt: Added.
+ * fast/css-grid-layout/grid-item-with-border-in-intrinsic.html: Added.
+
</ins><span class="cx"> 2015-12-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up absolute positioned map properly.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemwithborderinintrinsicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt (0 => 194030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt 2015-12-14 10:06:08 UTC (rev 194030)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+X
+PASS
+X
+PASS
+X
+PASS
+X
+PASS
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemwithborderinintrinsichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html (0 => 194030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html 2015-12-14 10:06:08 UTC (rev 194030)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+.grid {
+ display: -webkit-grid;
+ font: 50px/1 Ahem;
+ border: 5px dashed magenta;
+ width: 150px;
+ height: 150px;
+}
+.item {
+ border: 50px solid rgba(0, 255, 250, 0.5);
+}
+.gridFR {
+ -webkit-grid: 1fr / 1fr;
+}
+.gridMaxContent {
+ -webkit-grid: -webkit-max-content / -webkit-max-content;
+}
+.gridMinContent {
+ -webkit-grid: -webkit-min-content / -webkit-min-content;
+}
+.gridAuto {
+ -webkit-grid: auto / auto;
+}
+</style>
+<script src="../../resources/check-layout.js"></script>
+
+<body onload="checkLayout('.grid')">
+
+<div class="grid gridFR" data-expected-width="160" data-expected-height="160" data-expected-client-width="150" data-expected-client-height="150">
+ <div class="item" data-expected-width="150" data-expected-height="150" data-expected-client-width="50" data-expected-client-height="50">X</div>
+</div>
+
+<div class="grid gridMinContent" data-expected-width="160" data-expected-height="160" data-expected-client-width="150" data-expected-client-height="150">
+ <div class="item" data-expected-width="150" data-expected-height="150" data-expected-client-width="50" data-expected-client-height="50">X</div>
+</div>
+
+<div class="grid gridMaxContent" data-expected-width="160" data-expected-height="160" data-expected-client-width="150" data-expected-client-height="150">
+ <div class="item" data-expected-width="150" data-expected-height="150" data-expected-client-width="50" data-expected-client-height="50">X</div>
+</div>
+
+<div class="grid gridAuto" data-expected-width="160" data-expected-height="160" data-expected-client-width="150" data-expected-client-height="150">
+ <div class="item" data-expected-width="150" data-expected-height="150" data-expected-client-width="50" data-expected-client-height="50">X</div>
+</div>
+
+</body>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194029 => 194030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-14 07:24:01 UTC (rev 194029)
+++ trunk/Source/WebCore/ChangeLog 2015-12-14 10:06:08 UTC (rev 194030)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-14 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Fix height computation of grid items with borders
+ https://bugs.webkit.org/show_bug.cgi?id=151800
+
+ Reviewed by Darin Adler.
+
+ When computing the logical height of grid items for the
+ default "min-height: auto;" case we were constraning the
+ min-content size using constrainLogicalHeightByMinMax()
+ instead of constrainContentLogicalHeightByMinMax(). The
+ problem of using the former is that we were adding the borders
+ twice.
+
+ Test: fast/css-grid-layout/grid-item-with-border-in-intrinsic.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalHeight):
+
</ins><span class="cx"> 2015-12-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Adopt CGIOSurfaceContextCreateImageReference to avoid unnecessary readback
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (194029 => 194030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-12-14 07:24:01 UTC (rev 194029)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-12-14 10:06:08 UTC (rev 194030)
</span><span class="lines">@@ -2786,7 +2786,7 @@
</span><span class="cx"> if (parent()->isRenderGrid() && style().logicalHeight().isAuto() && style().logicalMinHeight().isAuto() && style().overflowX() == OVISIBLE) {
</span><span class="cx"> LayoutUnit intrinsicContentHeight = computedValues.m_extent - borderAndPaddingLogicalHeight();
</span><span class="cx"> if (auto minContentHeight = computeContentLogicalHeight(MinSize, Length(MinContent), intrinsicContentHeight))
</span><del>- contentHeight = std::max(contentHeight, constrainLogicalHeightByMinMax(minContentHeight.value(), intrinsicContentHeight));
</del><ins>+ contentHeight = std::max(contentHeight, constrainContentBoxLogicalHeightByMinMax(minContentHeight.value(), intrinsicContentHeight));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> h = Length(contentHeight, Fixed);
</span></span></pre>
</div>
</div>
</body>
</html>