<!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>[207457] 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/207457">207457</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2016-10-18 02:21:58 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Constrain by min|max-height on auto repeat computation
https://bugs.webkit.org/show_bug.cgi?id=163540
Reviewed by Darin Adler.
Source/WebCore:
The max-height (if definite) is used to compute the number of auto repeat rows whenever the
height is indefinite. We were using the min-height only in case both values were indefinite.
Although not explicitly mentioned by grid specs, it's reasonable to assume that
the min-height trumps the used value of height/max-height like it always does, per CSS
2.2. Note that the number of rows still needs to fit within that size even if using
min-height, because we're just using min-height to compute the used value of the height
property. If both height and max-height are indefinite we keep doing the same, i.e., compute
the minimum number of rows that fulfill min-height (if definite).
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeAutoRepeatTracksCount):
LayoutTests:
Some new test cases to verify that min-height is used on the auto repeat tracks computation
whenever the height is indefinite and max-height is not.
* fast/css-grid-layout/grid-auto-fill-rows-expected.txt:
* fast/css-grid-layout/grid-auto-fill-rows.html:
* fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt:
* fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautofillrowsexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautofillrowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashhtml">trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/LayoutTests/ChangeLog 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-17 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Constrain by min|max-height on auto repeat computation
+ https://bugs.webkit.org/show_bug.cgi?id=163540
+
+ Reviewed by Darin Adler.
+
+ Some new test cases to verify that min-height is used on the auto repeat tracks computation
+ whenever the height is indefinite and max-height is not.
+
+ * fast/css-grid-layout/grid-auto-fill-rows-expected.txt:
+ * fast/css-grid-layout/grid-auto-fill-rows.html:
+ * fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt:
+ * fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html:
+
</ins><span class="cx"> 2016-10-17 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Add test and infrastructure for link popover
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautofillrowsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows-expected.txt (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows-expected.txt 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows-expected.txt 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -29,3 +29,5 @@
</span><span class="cx"> PASS
</span><span class="cx"> PASS
</span><span class="cx"> PASS
</span><ins>+PASS
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautofillrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -23,7 +23,9 @@
</span><span class="cx"> .gridMultipleNames { grid-template-rows: [start] 20px [foo] 50% repeat(auto-fill, [bar] 20px [start foo]) [foo] 10% [end bar]; }
</span><span class="cx"> .gridMultipleTracks { grid-template-rows: [start] 20px repeat(auto-fill, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
</span><span class="cx">
</span><del>-.item { background-color: cyan; }
</del><ins>+.item { background-color: blue; }
+.item:nth-child(2) { background: green; }
+.item:nth-child(3) { background: orange; }
</ins><span class="cx">
</span><span class="cx"> .gap { grid-row-gap: 20px; }
</span><span class="cx">
</span><span class="lines">@@ -51,6 +53,18 @@
</span><span class="cx"> <div class="item" style="grid-row: autobar 2 / span 3" data-offset-y="100" data-offset-x="0" data-expected-height="257" data-expected-width="25"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<div class="grid gridOnlyAutoRepeat gap" style="height: auto; max-height: 90px;" data-expected-height="94" data-expected-width="29">
+ <div class="item" data-offset-y="0" data-offset-x="0" data-expected-height="30" data-expected-width="25"></div>
+ <div class="item" data-offset-y="50" data-offset-x="0" data-expected-height="30" data-expected-width="25"></div>
+ <div class="item" data-offset-y="100" data-offset-x="0" data-expected-height="157" data-expected-width="25"></div>
+</div>
+
+<div class="grid gridOnlyAutoRepeat gap" style="height: auto; max-height: 90px; min-height: 130px;" data-expected-height="134" data-expected-width="29">
+ <div class="item" data-offset-y="0" data-offset-x="0" data-expected-height="30" data-expected-width="25"></div>
+ <div class="item" data-offset-y="50" data-offset-x="0" data-expected-height="30" data-expected-width="25"></div>
+ <div class="item" data-offset-y="100" data-offset-x="0" data-expected-height="30" data-expected-width="25"></div>
+</div>
+
</ins><span class="cx"> <div class="grid gridAutoRepeatAndFixedBefore">
</span><span class="cx"> <div class="item" style="grid-row: 1 / span 6" data-offset-y="0" data-offset-x="0" data-expected-height="190" data-expected-width="25"></div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -8,6 +8,16 @@
</span><span class="cx"> item
</span><span class="cx"> item
</span><span class="cx"> item
</span><ins>+item
+item
+item
+item
+item
+item
+item
+item
+item
+item
</ins><span class="cx"> This test checks that the computation of auto repeat tracks works when the grid container width is indefinite.
</span><span class="cx">
</span><span class="cx"> This test has PASSED if it didn't CRASH.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -42,5 +42,85 @@
</span><span class="cx"> <div class="grid autoFill min-width-max-content min-height-max-content">item</div>
</span><span class="cx"> <div class="grid autoFit min-width-max-content min-height-max-content">item</div>
</span><span class="cx">
</span><ins>+<div class="min-height-max-content min-width-min-content">
+ <div class="grid autoFill"></div>
+</div>
+
+<div class="max-content">
+ <div class="grid autoFit"></div>
+</div>
+
+<div class="min-content min-width-min-content">
+ <div class="grid autoFill"></div>
+</div>
+
+<div class="max-content max-width-min-content">
+ <div class="grid autoFit"></div>
+</div>
+
+<div class="min-height-max-content min-content">
+ <div class="grid autoFill"></div>
+</div>
+
+<div class="min-height-min-content max-content">
+ <div class="grid autoFit"></div>
+</div>
+
+<div class="min-height-max-content min-width-min-content">
+ <div class="grid autoFill min-width-min-content"></div>
+</div>
+
+<div class="min-height-max-content min-width-min-content">
+ <div class="grid autoFit min-height-min-content"></div>
+</div>
+
+<div class="max-content min-width-min-content">
+ <div class="grid autoFill"></div>
+</div>
+
+<div class="max-height-min-content min-content">
+ <div class="grid autoFit max-height-max-content"></div>
+</div>
+
+<div class="min-height-max-content min-content">
+ <div class="grid autoFill">item</div>
+</div>
+
+<div class="min-height-min-content max-width-min-content">
+ <div class="grid autoFit">item</div>
+</div>
+
+<div class="max-height-max-content max-width-max-content">
+ <div class="grid autoFill max-width-min-content">item</div>
+</div>
+
+<div class="max-height-min-content min-content">
+ <div class="grid autoFit min-height-max-content max-height-min-content">item</div>
+</div>
+
+<div class="min-height-max-content max-content">
+ <div class="grid autoFill max-height-max-content">item</div>
+</div>
+
+<div class="min-content min-width-max-content">
+ <div class="grid autoFit max-width-max-content">item</div>
+</div>
+
+<div class="min-content max-width-max-content">
+ <div class="grid autoFill min-height-min-content">item</div>
+</div>
+
+<div class="min-height-min-content min-content">
+ <div class="grid autoFit max-height-min-content">item</div>
+</div>
+
+<div class="max-height-max-content max-content">
+ <div class="grid autoFill max-height-min-content">item</div>
+</div>
+
+<div class="min-content min-width-min-content">
+ <div class="grid autoFit min-content min-height-min-content max-height-max-content">item</div>
+</div>
+
</ins><span class="cx"> <p>This test checks that the computation of auto repeat tracks works when the grid container width is indefinite.</p>
</span><span class="cx"> <p>This test has PASSED if it didn't CRASH.</p>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-17 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Constrain by min|max-height on auto repeat computation
+ https://bugs.webkit.org/show_bug.cgi?id=163540
+
+ Reviewed by Darin Adler.
+
+ The max-height (if definite) is used to compute the number of auto repeat rows whenever the
+ height is indefinite. We were using the min-height only in case both values were indefinite.
+
+ Although not explicitly mentioned by grid specs, it's reasonable to assume that
+ the min-height trumps the used value of height/max-height like it always does, per CSS
+ 2.2. Note that the number of rows still needs to fit within that size even if using
+ min-height, because we're just using min-height to compute the used value of the height
+ property. If both height and max-height are indefinite we keep doing the same, i.e., compute
+ the minimum number of rows that fulfill min-height (if definite).
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeAutoRepeatTracksCount):
+
</ins><span class="cx"> 2016-10-17 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Use NativeCallFrameTracer for operations used for DOMJIT slow calls
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (207456 => 207457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-10-18 08:13:26 UTC (rev 207456)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-10-18 09:21:58 UTC (rev 207457)
</span><span class="lines">@@ -1488,14 +1488,14 @@
</span><span class="cx"> if (sizingOperation != IntrinsicSizeComputation)
</span><span class="cx"> availableSize = availableLogicalWidth();
</span><span class="cx"> } else {
</span><del>- availableSize = computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), LayoutUnit(-1));
</del><ins>+ availableSize = computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt);
</ins><span class="cx"> if (!availableSize) {
</span><span class="cx"> const Length& maxLength = style().logicalMaxHeight();
</span><span class="cx"> if (!maxLength.isUndefined())
</span><del>- availableSize = computeContentLogicalHeight(MaxSize, maxLength, LayoutUnit(-1));
- } else {
- availableSize = constrainLogicalHeightByMinMax(availableSize.value(), LayoutUnit(-1));
</del><ins>+ availableSize = computeContentLogicalHeight(MaxSize, maxLength, Nullopt);
</ins><span class="cx"> }
</span><ins>+ if (availableSize)
+ availableSize = constrainContentBoxLogicalHeightByMinMax(availableSize.value(), Nullopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool needsToFulfillMinimumSize = false;
</span></span></pre>
</div>
</div>
</body>
</html>