<!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>[189911] 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/189911">189911</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2015-09-17 05:13:30 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Using automatic (instead of min-content) minimums for 'auto' tracks
https://bugs.webkit.org/show_bug.cgi?id=142329
Reviewed by Darin Adler.
Based on Blink's <a href="http://trac.webkit.org/projects/webkit/changeset/198697">r198697</a> by <svillar@igalia.com> and <a href="http://trac.webkit.org/projects/webkit/changeset/200478">r200478</a> by <jfernandez@igalia.com>
Source/WebCore:
More precisely (syntax-wise), this would allow 'auto' to be used within the
minmax() function (it's currently forbidden) and have the 'auto' keyword map
to minmax(auto, auto) instead of minmax(min-content, max-content).
- As a minimum, 'auto' would mean "use the specified minimum size, or if
that is auto, treat as 0 or min-content per Flexbox rules".
- As a maximum, 'auto' would mean "use the max-content size".
Regarding the implementation, a new phase is added to the track sizing
algorithm called ResolveIntrinsicMinimums (the former ResolveIntrinsicMinimums
is now called ResolveContentBasedMinimums which does not include 'auto'
resolution) which will be run before any other. This phase uses the minimum
size of grid items (as specified by min-width/height).
Tests: fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html
fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridBreadth):
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeUsedBreadthOfMinLength):
(WebCore::RenderGrid::computeUsedBreadthOfMaxLength):
(WebCore::RenderGrid::minSizeForChild):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
(WebCore::RenderGrid::trackSizeForTrackSizeComputationPhase):
(WebCore::RenderGrid::shouldProcessTrackForTrackSizeComputationPhase):
(WebCore::RenderGrid::trackShouldGrowBeyondGrowthLimitsForTrackSizeComputationPhase):
(WebCore::RenderGrid::markAsInfinitelyGrowableForTrackSizeComputationPhase):
(WebCore::RenderGrid::updateTrackSizeForTrackSizeComputationPhase):
(WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
* rendering/RenderGrid.h:
* rendering/style/GridTrackSize.h:
(WebCore::GridTrackSize::minTrackBreadth):
(WebCore::GridTrackSize::maxTrackBreadth):
(WebCore::GridTrackSize::cacheMinMaxTrackBreadthTypes):
(WebCore::GridTrackSize::hasIntrinsicMinTrackBreadth):
(WebCore::GridTrackSize::hasAutoMinTrackBreadth):
(WebCore::GridTrackSize::hasAutoMaxTrackBreadth):
(WebCore::GridTrackSize::hasMaxContentOrAutoMaxTrackBreadth):
(WebCore::GridTrackSize::hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth):
(WebCore::GridTrackSize::hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth): Deleted.
LayoutTests:
New tests to verify that auto is a valid keyword inside
minmax. Updated the expectations of existing tests to
reflect the new status of auto.
* fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt: Added.
* fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html: Added.
* fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt: Added.
* fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html: Added.
* fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set.html:
* fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
* fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultiplehtml">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultiplehtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridTrackSizeh">trunk/Source/WebCore/rendering/style/GridTrackSize.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautocolumnsexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautocolumnshtml">trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautorowsexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautorowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/ChangeLog 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-09-15 Sergio Villar Senin <svillar@igalia.com>
+
+ [CSS Grid Layout] Using automatic (instead of min-content) minimums for 'auto' tracks
+ https://bugs.webkit.org/show_bug.cgi?id=142329
+
+ Reviewed by Darin Adler.
+
+ Based on Blink's r198697 by <svillar@igalia.com> and r200478 by <jfernandez@igalia.com>
+
+ New tests to verify that auto is a valid keyword inside
+ minmax. Updated the expectations of existing tests to
+ reflect the new status of auto.
+
+ * fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
+ * fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt: Added.
+ * fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html: Added.
+ * fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt: Added.
+ * fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html: Added.
+ * fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
+
</ins><span class="cx"> 2015-09-17 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Relayout whenever Box Alignment properties change
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -10,6 +10,8 @@
</span><span class="cx"> PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('-webkit-grid-auto-columns') is "minmax(30%, 100px)"
</span><span class="cx"> PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('-webkit-grid-auto-rows') is "-webkit-min-content"
</span><span class="cx"> PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('-webkit-grid-auto-columns') is "-webkit-max-content"
</span><ins>+PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('-webkit-grid-auto-rows') is "minmax(auto, 48px)"
+PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('-webkit-grid-auto-columns') is "minmax(80px, auto)"
</ins><span class="cx">
</span><span class="cx"> Test that getting grid-template-columns and grid-template-rows set through CSS lists every track listed whether implicitly or explicitly created
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFixedFixedWithChildren, '').getPropertyValue('-webkit-grid-auto-rows') is "30px"
</span><span class="lines">@@ -50,8 +52,6 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is 'auto'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is 'auto'
</del><span class="cx">
</span><span class="cx"> Test setting grid-auto-columns and grid-auto-rows to 'inherit' through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is '50px'
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -26,6 +26,11 @@
</span><span class="cx"> -webkit-grid-template-columns: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.gridAutoAutoInMinMax {
+ -webkit-grid-auto-rows: minmax(auto, 8vh);
+ -webkit-grid-auto-columns: minmax(10vw, auto);
+}
+
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="lines">@@ -34,6 +39,7 @@
</span><span class="cx"> <div class="grid gridAutoFixedFixed" id="gridAutoFixedFixed"></div>
</span><span class="cx"> <div class="grid gridAutoMinMax" id="gridAutoMinMax"></div>
</span><span class="cx"> <div class="grid gridAutoMinMaxContent" id="gridAutoMinMaxContent"></div>
</span><ins>+<div class="grid gridAutoAutoInMinMax" id="gridAutoAutoInMinMax"></div>
</ins><span class="cx"> <div class="grid gridAutoFixedFixed" id="gridAutoFixedFixedWithChildren">
</span><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -48,6 +54,7 @@
</span><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixed"), "30px", "50px");
</span><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMax"), "minmax(10%, 15px)", "minmax(30%, 100px)");
</span><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "-webkit-min-content", "-webkit-max-content");
</span><ins>+testGridAutoDefinitionsValues(document.getElementById("gridAutoAutoInMinMax"), "minmax(auto, 48px)", "minmax(80px, auto)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test that getting grid-template-columns and grid-template-rows set through CSS lists every track listed whether implicitly or explicitly created");
</span><span class="lines">@@ -122,14 +129,6 @@
</span><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-// Auto is not allowed inside minmax.
-element.style.webkitGridAutoColumns = "minmax(auto, 8vh)";
-element.style.webkitGridAutoRows = "minmax(10vw, auto)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns')", "'auto'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows')", "'auto'");
-
-element = document.createElement("div");
-document.body.appendChild(element);
</del><span class="cx"> // None is not allowed for grid-auto-{rows|columns}.
</span><span class="cx"> element.style.webkitGridAutoColumns = "none";
</span><span class="cx"> element.style.webkitGridAutoRows = "none";
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautocolumnsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt (0 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+Check that min-width is honored when sizing auto columns.
+PASS window.getComputedStyle(gridAuto, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoItemSmallerThanMinSize, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoAuto, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridMinMaxMinContentAuto, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoMultipleItems, '').getPropertyValue('-webkit-grid-template-columns') is "30px"
+PASS window.getComputedStyle(gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "60px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
+
+Check that min-width is honored when sizing auto columns and spanning grid items.
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningOneNonSpannig, '').getPropertyValue('-webkit-grid-template-columns') is "35px 15px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "20px 40px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "20px 50px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoMultipleSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "35px 35px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "25px 65px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-columns') is "40px 50px"
+
+Check the interactions between width and min-width and auto tracks.
+PASS window.getComputedStyle(gridAutoWithFixedWidthChild, '').getPropertyValue('-webkit-grid-template-columns') is "60px"
+PASS window.getComputedStyle(gridAutoWithFixedWidthChildAndMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoWithFixedWidthChildAndHigherMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "90px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidth, '').getPropertyValue('-webkit-grid-template-columns') is "25px 25px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidthAndMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "25px 25px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth, '').getPropertyValue('-webkit-grid-template-columns') is "35px 35px"
+
+Check that borders and paddings are considering when computing min sizes.
+PASS window.getComputedStyle(gridAutoFixedMinWidthWithBorder, '').getPropertyValue('-webkit-grid-template-columns') is "50px"
+PASS window.getComputedStyle(gridAutoFixedMinWidthWithPadding, '').getPropertyValue('-webkit-grid-template-columns') is "56px"
+PASS window.getComputedStyle(gridAutoFixedMinWidthWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-columns') is "66px"
+PASS window.getComputedStyle(gridAutoAutoMinWidthWithBorder, '').getPropertyValue('-webkit-grid-template-columns') is "40px"
+PASS window.getComputedStyle(gridAutoAutoMinWidthWithPadding, '').getPropertyValue('-webkit-grid-template-columns') is "46px"
+PASS window.getComputedStyle(gridAutoAutoMinWidthWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-columns') is "56px"
+PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithBorder, '').getPropertyValue('-webkit-grid-template-columns') is "90px"
+PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithPadding, '').getPropertyValue('-webkit-grid-template-columns') is "96px"
+PASS window.getComputedStyle(gridAutoMaxContentMinWidthWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-columns') is "106px"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+XXXXXX
+XX
+XX XX XX
+XXX XX X
+X X X X X X
+XX
+XXXX XXXX
+XX XXXXX X
+XX
+XXXXXX
+XXXX XXXX
+XX
+XX XXXXXXXX
+XXXX XXXX
+XX XX
+XXXXXX X XXX
+XX XX XX
+X X
+XXXX
+X XXX XX
+XXX XXXX
+XX XX XX
+XXXXX X XXXXX
+X XXX XX
+XXXXX XXXXX
+XX XX
+XX XX XX XX
+XXX
+X XX XXX
+X XX X
+XXX X
+XXX X
+XXX X
+XX XXX
+XX XXX XX
+XX XXX XX
+XXXXXX
+XXXXXX
+XXXXXX
+XX XXX X
+XX XXX X
+XX XXX X
+X XXXX X
+X XXXX X
+X XXXX X
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns-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="trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautocolumnshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html (0 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -0,0 +1,275 @@
</span><ins>+<html>
+<link href="resources/grid.css" rel="stylesheet"/>
+<style>
+.grid { font: 10px/1 Ahem; }
+
+.minWidth10 { min-width: 10px; }
+.minWidth20 { min-width: 20px; }
+.minWidth30 { min-width: 30px; }
+.minWidth40 { min-width: 40px; }
+.minWidth50 { min-width: 50px; }
+.minWidth60 { min-width: 60px; }
+.minWidth70 { min-width: 70px; }
+.minWidth90 { min-width: 90px; }
+.minWidthMaxContent { min-width: -webkit-max-content; }
+
+.width50 { width: 50px; }
+.width60 { width: 60px; }
+
+.border5 { border: 5px solid #abc; }
+.padding8 { padding: 0px 8px 0px; }
+
+/* All these 4 cases are equivalent. We use them interchangeably. */
+.gridAuto { -webkit-grid-template-columns: auto; }
+.gridMinMaxAutoAuto { -webkit-grid-template-columns: minmax(auto, auto); }
+.gridMinMaxAutoMaxContent { -webkit-grid-template-columns: minmax(auto, -webkit-max-content); }
+.gridMinMaxMinContentAuto { -webkit-grid-template-columns: minmax(-webkit-min-content, auto); }
+
+/* All these 3 cases are equivalent. We use them interchangeably. */
+.gridAutoAndAuto { -webkit-grid-template-columns: auto auto; }
+.gridAutoAndMinMaxAutoAuto { -webkit-grid-template-columns: auto minmax(auto, auto); }
+.gridMinMaxAutoMaxContentAndAuto { -webkit-grid-template-columns: minmax(auto, -webkit-max-content) auto; }
+
+</style>
+<script src="../../resources/js-test.js"></script>
+<body>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAuto">
+ <div class="firstRowFirstColumn minWidth40">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoItemSmallerThanMinSize">
+ <div class="firstRowFirstColumn minWidth40">XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoAuto" id="gridMinMaxAutoAuto">
+ <div class="firstRowFirstColumn minWidth40">XX XX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoMaxContent" id="gridMinMaxAutoMaxContent">
+ <div class="firstRowFirstColumn minWidth40">XXX XX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxMinContentAuto" id="gridMinMaxMinContentAuto">
+ <div class="firstRowFirstColumn minWidth40">X X X X X X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMultipleItems">
+ <div class="firstRowFirstColumn minWidth30">XX</div>
+ <div class="secondRowFirstColumn minWidth20"">XXXX XXXX</div>
+ <div class="thirdRowAutoColumn minWidth10">XX XXXXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoAuto" id="gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth">
+ <div class="firstRowFirstColumn minWidth30">XX</div>
+ <div class="secondRowFirstColumn">XXXXXX</div>
+ <div class="thirdRowAutoColumn minWidth20">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoMaxContent" id="gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth">
+ <div class="firstRowFirstColumn minWidth30">XX</div>
+ <div class="secondRowFirstColumn">XX XXXXXXXX</div>
+ <div class="thirdRowAutoColumn minWidth20">XXXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningOneNonSpannig">
+ <div class="firstRowFirstColumn">XX XX</div>
+ <div class="secondRowBothColumn minWidth50">XXXXXX X XXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningMultipleNonSpanning">
+ <div class="secondRowBothColumn minWidth60">XX XX XX</div>
+ <div class="firstRowSecondColumn">X X</div>
+ <div class="firstRowSecondColumn">XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndMinMaxAutoAuto" id="gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning">
+ <div class="firstRowSecondColumn">X XXX XX</div>
+ <div class="secondRowBothColumn minWidth70">XXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndMinMaxAutoAuto" id="gridAutoAndMinMaxAutoAutoMultipleSpanning">
+ <div class="secondRowBothColumn minWidth70">XX XX XX</div>
+ <div class="firstRowBothColumn">XXXXX X XXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoMaxContentAndAuto" id="gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning">
+ <div class="firstRowSecondColumn minWidth60">X XXX XX</div>
+ <div class="secondRowBothColumn minWidth90">XXXXX XXXXX</div>
+ <div class="firstRowFirstColumn">XX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoMaxContentAndAuto" id="gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning">
+ <div class="secondRowBothColumn">XX XX XX XX</div>
+ <div class="firstRowFirstColumn minWidth40">XXX</div>
+ <div class="firstRowBothColumn minWidth90">X XX XXX</div>
+ <div class="firstRowSecondColumn">X XX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoWithFixedWidthChild">
+ <div class="firstRowFirstColumn width60">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoWithFixedWidthChildAndMinWidth">
+ <div class="firstRowFirstColumn width60 minWidth40">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoWithFixedWidthChildAndHigherMinWidth">
+ <div class="firstRowFirstColumn width60 minWidth90">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedWidth">
+ <div class="firstRowBothColumn width50">XX XXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedWidthAndMinWidth">
+ <div class="firstRowBothColumn width60 minWidth50">XX XXX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth">
+ <div class="firstRowBothColumn width60 minWidth70">XX XXX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoFixedMinWidthWithBorder">
+ <div class="firstRowFirstColumn minWidth40 border5">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoFixedMinWidthWithPadding">
+ <div class="firstRowFirstColumn minWidth40 padding8">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoFixedMinWidthWithBorderAndPadding">
+ <div class="firstRowFirstColumn minWidth40 border5 padding8">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoAutoMinWidthWithBorder">
+ <div class="firstRowFirstColumn border5">XX XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoAutoMinWidthWithPadding">
+ <div class="firstRowFirstColumn padding8">XX XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoAutoMinWidthWithBorderAndPadding">
+ <div class="firstRowFirstColumn border5 padding8">XX XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMaxContentMinWidthWithBorder">
+ <div class="firstRowFirstColumn minWidthMaxContent border5">X XXXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMaxContentMinWidthWithPadding">
+ <div class="firstRowFirstColumn minWidthMaxContent padding8">X XXXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMaxContentMinWidthWithBorderAndPadding">
+ <div class="firstRowFirstColumn border5 padding8 minWidthMaxContent">X XXXX X</div>
+ </div>
+</div>
+
+<script>
+function testGridColumnsValues(id, computedColumnValue)
+{
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue);
+}
+
+debug("Check that min-width is honored when sizing auto columns.");
+testGridColumnsValues("gridAuto", "40px");
+testGridColumnsValues("gridAutoItemSmallerThanMinSize", "40px");
+testGridColumnsValues("gridMinMaxAutoAuto", "40px");
+testGridColumnsValues("gridMinMaxAutoMaxContent", "40px");
+testGridColumnsValues("gridMinMaxMinContentAuto", "40px");
+testGridColumnsValues("gridAutoMultipleItems", "30px");
+testGridColumnsValues("gridMinMaxAutoAutoMultipleItemsOneWithoutMinWidth", "60px");
+testGridColumnsValues("gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinWidth", "80px");
+
+debug("");
+debug("Check that min-width is honored when sizing auto columns and spanning grid items.");
+testGridColumnsValues("gridAutoAndAutoOneSpanningOneNonSpannig", "35px 15px");
+testGridColumnsValues("gridAutoAndAutoOneSpanningMultipleNonSpanning", "20px 40px");
+testGridColumnsValues("gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning", "20px 50px");
+testGridColumnsValues("gridAutoAndMinMaxAutoAutoMultipleSpanning", "35px 35px");
+testGridColumnsValues("gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning", "25px 65px");
+testGridColumnsValues("gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning", "40px 50px");
+
+debug("");
+debug("Check the interactions between width and min-width and auto tracks.");
+testGridColumnsValues("gridAutoWithFixedWidthChild", "60px");
+testGridColumnsValues("gridAutoWithFixedWidthChildAndMinWidth", "40px");
+testGridColumnsValues("gridAutoWithFixedWidthChildAndHigherMinWidth", "90px");
+testGridColumnsValues("gridAutoAndAutoOneSpanningFixedWidth", "25px 25px");
+testGridColumnsValues("gridAutoAndAutoOneSpanningFixedWidthAndMinWidth", "25px 25px");
+testGridColumnsValues("gridAutoAndAutoOneSpanningFixedWidthAndHigherMinWidth", "35px 35px");
+
+debug("");
+debug("Check that borders and paddings are considering when computing min sizes.");
+testGridColumnsValues("gridAutoFixedMinWidthWithBorder", "50px");
+testGridColumnsValues("gridAutoFixedMinWidthWithPadding", "56px");
+testGridColumnsValues("gridAutoFixedMinWidthWithBorderAndPadding", "66px");
+testGridColumnsValues("gridAutoAutoMinWidthWithBorder", "40px");
+testGridColumnsValues("gridAutoAutoMinWidthWithPadding", "46px");
+testGridColumnsValues("gridAutoAutoMinWidthWithBorderAndPadding", "56px");
+testGridColumnsValues("gridAutoMaxContentMinWidthWithBorder", "90px");
+testGridColumnsValues("gridAutoMaxContentMinWidthWithPadding", "96px");
+testGridColumnsValues("gridAutoMaxContentMinWidthWithBorderAndPadding", "106px");
+
+</script>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.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="trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautorowsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt (0 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+
+Check that min-height is honored when sizing auto rows.
+PASS window.getComputedStyle(gridAuto, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridAutoItemSmallerThanMinSize, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoAuto, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "20px"
+PASS window.getComputedStyle(gridMinMaxMinContentAuto, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridAutoMultipleItems, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridMinMaxAutoAutoMultipleItemsOneWithoutMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "50px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
+
+Check that min-height is honored when sizing auto rows and spanning grid items.
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningOneNonSpannig, '').getPropertyValue('-webkit-grid-template-rows') is "10px 40px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "40px 20px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "40px 30px"
+PASS window.getComputedStyle(gridAutoAndMinMaxAutoAutoMultipleSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "35px 35px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "25px 65px"
+PASS window.getComputedStyle(gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning, '').getPropertyValue('-webkit-grid-template-rows') is "50px 40px"
+
+Check the interactions between height and min-height and auto tracks.
+PASS window.getComputedStyle(gridAutoWithFixedHeightChild, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridAutoWithFixedHeightChildAndMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridAutoWithFixedHeightChildAndHigherMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "90px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeight, '').getPropertyValue('-webkit-grid-template-rows') is "25px 25px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeightAndMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "25px 25px"
+PASS window.getComputedStyle(gridAutoAndAutoOneSpanningFixedHeightAndHigherMinHeight, '').getPropertyValue('-webkit-grid-template-rows') is "35px 35px"
+
+Check that borders and paddings are considering when computing min sizes.
+PASS window.getComputedStyle(gridAutoFixedMinHeightWithBorder, '').getPropertyValue('-webkit-grid-template-rows') is "50px"
+PASS window.getComputedStyle(gridAutoFixedMinHeightWithPadding, '').getPropertyValue('-webkit-grid-template-rows') is "56px"
+PASS window.getComputedStyle(gridAutoFixedMinHeightWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
+PASS window.getComputedStyle(gridAutoAutoMinHeightWithBorder, '').getPropertyValue('-webkit-grid-template-rows') is "40px"
+PASS window.getComputedStyle(gridAutoAutoMinHeightWithPadding, '').getPropertyValue('-webkit-grid-template-rows') is "46px"
+PASS window.getComputedStyle(gridAutoAutoMinHeightWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-rows') is "56px"
+PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithBorder, '').getPropertyValue('-webkit-grid-template-rows') is "30px"
+PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithPadding, '').getPropertyValue('-webkit-grid-template-rows') is "36px"
+PASS window.getComputedStyle(gridAutoMaxContentMinHeightWithBorderAndPadding, '').getPropertyValue('-webkit-grid-template-rows') is "46px"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+XX
+XXX
+XX
+XXX
+XXXX
+XX
+XX
+XX
+X
+X
+X
+XXX
+X
+XX
+XX
+X
+X
+XXXX
+X
+XX
+XXX
+X
+X
+XX
+XXX
+XX
+XXX
+XX
+XX XX
+XXXXXX X XXX
+XX XX XX
+X X X X
+XX XX
+X XXX XX
+XXX XXXX
+XX XX XX
+XXXXX X XXXXX
+X XXX XX
+XXXXX XXXXX
+XX XX
+XX XX XX XX
+XXX
+X XX XXX
+X XX X
+XXX X
+XXX X
+XXX X
+XX XXX XX XXX XX XXX
+XX XXX XX
+XX XXX XX X XX
+XXXXXX
+XXXXXX
+XXXXXX
+XX
+XXX X
+XX
+XXX X
+XX
+XXX X
+XXX X
+XXX X
+XXX X
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows-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="trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautorowshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html (0 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -0,0 +1,261 @@
</span><ins>+<html>
+<link href="resources/grid.css" rel="stylesheet"/>
+<style>
+.grid { font: 10px/1 Ahem; }
+
+.minHeight10 { min-height: 10px; }
+.minHeight20 { min-height: 20px; }
+.minHeight30 { min-height: 30px; }
+.minHeight40 { min-height: 40px; }
+.minHeight50 { min-height: 50px; }
+.minHeight60 { min-height: 60px; }
+.minHeight70 { min-height: 70px; }
+.minHeight90 { min-height: 90px; }
+.minHeightMaxContent { min-height: -webkit-max-content; }
+
+.height30 { height: 30px; }
+.height50 { height: 50px; }
+.height60 { height: 60px; }
+
+.border5 { border: 5px solid #abc; }
+.padding8 { padding: 8px 0px; }
+
+/* All these 4 cases are equivalent. We use them interchangeably. */
+.gridAuto { -webkit-grid-template-rows: auto; }
+.gridMinMaxAutoAuto { -webkit-grid-template-rows: minmax(auto, auto); }
+.gridMinMaxAutoMaxContent { -webkit-grid-template-rows: minmax(auto, -webkit-max-content); }
+.gridMinMaxMinContentAuto { -webkit-grid-template-rows: minmax(-webkit-min-content, auto); }
+
+/* All these 3 cases are equivalent. We use them interchangeably. */
+.gridAutoAndAuto { -webkit-grid-template-rows: auto auto; }
+.gridAutoAndMinMaxAutoAuto { -webkit-grid-template-rows: auto minmax(auto, auto); }
+.gridMinMaxAutoMaxContentAndAuto { -webkit-grid-template-rows: minmax(auto, -webkit-max-content) auto; }
+
+</style>
+<script src="../../resources/js-test.js"></script>
+<body>
+
+<div class="grid gridAuto constrainedContainer" id="gridAuto">
+ <div class="firstRowFirstColumn minHeight40">XX<br>XXX<br>XX<br>XXX<br>XXXX</div>
+</div>
+
+<div class="grid gridAuto constrainedContainer" id="gridAutoItemSmallerThanMinSize">
+ <div class="firstRowFirstColumn minHeight40">XX</div>
+</div>
+
+<div class="grid gridMinMaxAutoAuto constrainedContainer" id="gridMinMaxAutoAuto">
+ <div class="firstRowFirstColumn minHeight40">XX<br>XX</div>
+</div>
+
+<div class="grid gridMinMaxAutoMaxContent constrainedContainer" id="gridMinMaxAutoMaxContent">
+ <div class="firstRowFirstColumn minHeight20 height30"></div>
+</div>
+
+<div class="grid gridMinMaxMinContentAuto constrainedContainer" id="gridMinMaxMinContentAuto">
+ <div class="firstRowFirstColumn minHeight60">X</div>
+</div>
+
+<div class="grid gridAuto constrainedContainer" id="gridAutoMultipleItems">
+ <div class="firstRowFirstColumn minHeight60">X<br>X</div>
+ <div class="firstRowSecondColumn minHeight20"">XXX<br>X<br>XX<br>XX</div>
+ <div class="firstRowAutoColumn minConstrainedContainer height50"></div>
+</div>
+
+<div class="grid gridMinMaxAutoAuto constrainedContainer" id="gridMinMaxAutoAutoMultipleItemsOneWithoutMinHeight">
+ <div class="firstRowFirstColumn height30">X<br>X</div>
+ <div class="firstRowSecondColumn minHeight50"></div>
+ <div class="firstRowAutoColumn minHeight20">XXXX<br>X<br>XX<br>XXX</div>
+</div>
+
+<div class="grid gridMinMaxAutoMaxContent constrainedContainer" id="gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinHeight">
+ <div class="firstRowFirstColumn minHeight30">X<br>X</div>
+ <div class="firstRowSecondColumn height60">XX</div>
+ <div class="firstRowAutoColumn minHeight20">XXX<br>XX<br>XXX<br>XX</div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningOneNonSpannig">
+ <div class="firstRowFirstColumn">XX XX</div>
+ <div class="bothRowFirstColumn minHeight50">XXXXXX X XXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningMultipleNonSpanning">
+ <div class="bothRowSecondColumn minHeight60">XX XX XX</div>
+ <div class="firstRowFirstColumn">X X X X</div>
+ <div class="firstRowFirstColumn">XX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndMinMaxAutoAuto" id="gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning">
+ <div class="secondRowFirstColumn">X XXX XX</div>
+ <div class="bothRowSecondColumn minHeight70">XXX XXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndMinMaxAutoAuto" id="gridAutoAndMinMaxAutoAutoMultipleSpanning">
+ <div class="bothRowSecondColumn minHeight70">XX XX XX</div>
+ <div class="bothRowFirstColumn">XXXXX X XXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoMaxContentAndAuto" id="gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning">
+ <div class="secondRowFirstColumn minHeight60">X XXX XX</div>
+ <div class="bothRowSecondColumn minHeight90">XXXXX XXXXX</div>
+ <div class="firstRowFirstColumn">XX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridMinMaxAutoMaxContentAndAuto" id="gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning">
+ <div class="bothRowSecondColumn">XX XX XX XX</div>
+ <div class="firstRowFirstColumn minHeight40">XXX</div>
+ <div class="bothRowFirstColumn minHeight90">X XX XXX</div>
+ <div class="secondRowFirstColumn">X XX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoWithFixedHeightChild">
+ <div class="firstRowFirstColumn height60">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto height30" id="gridAutoWithFixedHeightChildAndMinHeight">
+ <div class="firstRowFirstColumn height60 minHeight40">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoWithFixedHeightChildAndHigherMinHeight">
+ <div class="firstRowFirstColumn height60 minHeight90">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedHeight">
+ <div class="bothRowFirstColumn height50">XX XXX XX XXX XX XXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto height30" id="gridAutoAndAutoOneSpanningFixedHeightAndMinHeight">
+ <div class="bothRowFirstColumn height60 minHeight50">XX XXX XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAutoAndAuto" id="gridAutoAndAutoOneSpanningFixedHeightAndHigherMinHeight">
+ <div class="bothRowFirstColumn height60 minHeight70">XX XXX XX X XX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoFixedMinHeightWithBorder">
+ <div class="firstRowFirstColumn minHeight40 border5">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoFixedMinHeightWithPadding">
+ <div class="firstRowFirstColumn minHeight40 padding8">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoFixedMinHeightWithBorderAndPadding">
+ <div class="firstRowFirstColumn minHeight40 border5 padding8">XXXXXX</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoAutoMinHeightWithBorder">
+ <div class="firstRowFirstColumn border5">XX<br>XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoAutoMinHeightWithPadding">
+ <div class="firstRowFirstColumn padding8">XX<br>XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoAutoMinHeightWithBorderAndPadding">
+ <div class="firstRowFirstColumn border5 padding8">XX<br>XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMaxContentMinHeightWithBorder">
+ <div class="firstRowFirstColumn minHeightMaxContent border5">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMaxContentMinHeightWithPadding">
+ <div class="firstRowFirstColumn minHeightMaxContent padding8">XXX X</div>
+ </div>
+</div>
+
+<div class="constrainedContainer">
+ <div class="grid gridAuto" id="gridAutoMaxContentMinHeightWithBorderAndPadding">
+ <div class="firstRowFirstColumn border5 padding8 minHeightMaxContent">XXX X</div>
+ </div>
+</div>
+
+<script>
+function testGridRowsValues(id, computedRowValue)
+{
+ shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyValue('-webkit-grid-template-rows')", computedRowValue);
+}
+
+debug("");
+debug("Check that min-height is honored when sizing auto rows.");
+testGridRowsValues("gridAuto", "40px");
+testGridRowsValues("gridAutoItemSmallerThanMinSize", "40px");
+testGridRowsValues("gridMinMaxAutoAuto", "40px");
+testGridRowsValues("gridMinMaxAutoMaxContent", "20px");
+testGridRowsValues("gridMinMaxMinContentAuto", "60px");
+testGridRowsValues("gridAutoMultipleItems", "60px");
+testGridRowsValues("gridMinMaxAutoAutoMultipleItemsOneWithoutMinHeight", "50px");
+testGridRowsValues("gridMinMaxAutoMaxContentMultipleItemsOneWithAutoMinHeight", "60px");
+
+debug("");
+debug("Check that min-height is honored when sizing auto rows and spanning grid items.");
+testGridRowsValues("gridAutoAndAutoOneSpanningOneNonSpannig", "10px 40px");
+testGridRowsValues("gridAutoAndAutoOneSpanningMultipleNonSpanning", "40px 20px");
+testGridRowsValues("gridAutoAndMinMaxAutoAutoOneSpanningOneNonSpanning", "40px 30px");
+testGridRowsValues("gridAutoAndMinMaxAutoAutoMultipleSpanning", "35px 35px");
+testGridRowsValues("gridMinMaxAutoMaxContentAndAutoOneSpanningMultipleNonSpanning", "25px 65px");
+testGridRowsValues("gridMinMaxAutoMaxContentAndAutoMultipleSpanningMultipleNonSpanning", "50px 40px");
+
+debug("");
+debug("Check the interactions between height and min-height and auto tracks.");
+testGridRowsValues("gridAutoWithFixedHeightChild", "60px");
+testGridRowsValues("gridAutoWithFixedHeightChildAndMinHeight", "40px");
+testGridRowsValues("gridAutoWithFixedHeightChildAndHigherMinHeight", "90px");
+testGridRowsValues("gridAutoAndAutoOneSpanningFixedHeight", "25px 25px");
+testGridRowsValues("gridAutoAndAutoOneSpanningFixedHeightAndMinHeight", "25px 25px");
+testGridRowsValues("gridAutoAndAutoOneSpanningFixedHeightAndHigherMinHeight", "35px 35px");
+
+debug("");
+debug("Check that borders and paddings are considering when computing min sizes.");
+testGridRowsValues("gridAutoFixedMinHeightWithBorder", "50px");
+testGridRowsValues("gridAutoFixedMinHeightWithPadding", "56px");
+testGridRowsValues("gridAutoFixedMinHeightWithBorderAndPadding", "66px");
+testGridRowsValues("gridAutoAutoMinHeightWithBorder", "40px");
+testGridRowsValues("gridAutoAutoMinHeightWithPadding", "46px");
+testGridRowsValues("gridAutoAutoMinHeightWithBorderAndPadding", "56px");
+testGridRowsValues("gridAutoMaxContentMinHeightWithBorder", "30px");
+testGridRowsValues("gridAutoMaxContentMinHeightWithPadding", "36px");
+testGridRowsValues("gridAutoMaxContentMinHeightWithBorderAndPadding", "46px");
+
+</script>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.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="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "300px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "415px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "300px"
</span><ins>+PASS window.getComputedStyle(gridWithAutoInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "20px"
+PASS window.getComputedStyle(gridWithAutoInsideMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values for -webkit-grid-template-columns and -webkit-grid-template-rows through CSS (they should resolve to the default: 'none')
</span><span class="cx"> PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="lines">@@ -100,6 +102,10 @@
</span><span class="cx"> PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
</span><span class="cx"> PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
</span><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS element.style.webkitGridTemplateColumns is "minmax(auto, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
+PASS element.style.webkitGridTemplateRows is "minmax(10vw, auto)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
</span><span class="cx"> PASS element.style.webkitGridTemplateColumns is "3600fr"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
</span><span class="lines">@@ -156,8 +162,6 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</del><span class="cx">
</span><span class="cx"> Test setting grid-template-columns and grid-template-rows back to 'none' through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "150px 53px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "400px 120px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "150px 175px"
</span><ins>+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "0px 30px"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "132px 60px"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
</span><span class="lines">@@ -78,6 +80,10 @@
</span><span class="cx"> PASS element.style.webkitGridTemplateColumns is "calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "100px 0px"
</span><span class="cx"> PASS element.style.webkitGridTemplateRows is "minmax(calc(75% - 350px), -webkit-max-content) auto"
</span><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px 16px"
+PASS element.style.webkitGridTemplateColumns is "auto minmax(16px, auto)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "90px 80px"
+PASS element.style.webkitGridTemplateRows is "minmax(auto, 15%) 10vw"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values set from CSS
</span><span class="cx"> PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="lines">@@ -106,8 +112,6 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</del><span class="cx">
</span><span class="cx"> Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 750px [last]"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultiplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -99,6 +99,10 @@
</span><span class="cx"> -webkit-grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><ins>+.gridWithAutoInsideMinMax {
+ -webkit-grid-template-columns: minmax(auto, -webkit-min-content) 30px;
+ -webkit-grid-template-rows: calc(100px + 2em) minmax(10%, auto);
+}
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -130,6 +134,7 @@
</span><span class="cx"> <div class="grid gridWithCalcAndFixed" id="gridWithCalcAndFixed"></div>
</span><span class="cx"> <div class="grid gridWithCalcAndMinMax" id="gridWithCalcAndMinMax"></div>
</span><span class="cx"> <div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMax"></div>
</span><ins>+<div class="grid gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMax"></div>
</ins><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script src="resources/grid-columns-rows-get-set-multiple.js"></script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
</del><ins>+<!DOCTYPE html>
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="lines">@@ -85,6 +85,10 @@
</span><span class="cx"> -webkit-grid-template-columns: minmax(10%, calc(50% + 15px));
</span><span class="cx"> -webkit-grid-template-rows: minmax(calc(20px + 10%), 50%);
</span><span class="cx"> }
</span><ins>+.gridWithAutoInsideMinMax {
+ -webkit-grid-template-columns: minmax(auto, 20px);
+ -webkit-grid-template-rows: minmax(max-content, auto);
+}
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -120,6 +124,9 @@
</span><span class="cx"> <div class="grid gridWithCalcComplex" id="gridWithCalcComplexElement"></div>
</span><span class="cx"> <div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div>
</span><span class="cx"> <div class="grid gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMaxElement"></div>
</span><ins>+<div class="grid gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMaxElement">
+ <div class="gridItem"></div>
+</div>
</ins><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script src="resources/grid-columns-rows-get-set.js"></script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(20px, 50%)"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(10%, calc(50% + 15px))"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(calc(20px + 10%), 50%)"
</span><ins>+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(auto, 20px)"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-min-content, auto)"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
</span><span class="cx"> PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="lines">@@ -104,6 +106,10 @@
</span><span class="cx"> PASS element.style.webkitGridTemplateColumns is "3fr"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "4fr"
</span><span class="cx"> PASS element.style.webkitGridTemplateRows is "4fr"
</span><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(auto, 48px)"
+PASS element.style.webkitGridTemplateColumns is "minmax(auto, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(80px, auto)"
+PASS element.style.webkitGridTemplateRows is "minmax(10vw, auto)"
</ins><span class="cx">
</span><span class="cx"> Test setting grid-template-columns and grid-template-rows to bad values through JS
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="lines">@@ -126,8 +132,6 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</del><span class="cx">
</span><span class="cx"> Test setting grid-template-columns and grid-template-rows back to 'none' through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(25%, -webkit-max-content) calc(10% - 7px)"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(calc(23px + 10%), 400px) 120px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "150px minmax(5%, calc(50% - 125px))"
</span><ins>+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(auto, 20px) 10%"
+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content minmax(-webkit-min-content, auto)"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
</span><span class="lines">@@ -70,6 +72,10 @@
</span><span class="cx"> PASS element.style.webkitGridTemplateColumns is "50% 12vw"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "5% 510px"
</span><span class="cx"> PASS element.style.webkitGridTemplateRows is "5% 85vh"
</span><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto minmax(16px, auto)"
+PASS element.style.webkitGridTemplateColumns is "auto minmax(16px, auto)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(auto, 15%) 80px"
+PASS element.style.webkitGridTemplateRows is "minmax(auto, 15%) 10vw"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values set from CSS
</span><span class="cx"> PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
</span><span class="lines">@@ -94,8 +100,6 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</del><span class="cx">
</span><span class="cx"> Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 1fr [last]"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultiplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx"> -webkit-grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><ins>+.gridWithAutoInsideMinMax {
+ -webkit-grid-template-columns: minmax(auto, 20px) 10%;
+ -webkit-grid-template-rows: -webkit-max-content minmax(-webkit-min-content, auto);
+}
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -105,6 +109,7 @@
</span><span class="cx"> <div class="gridWithCalcAndFixed" id="gridWithCalcAndFixed"></div>
</span><span class="cx"> <div class="gridWithCalcAndMinMax" id="gridWithCalcAndMinMax"></div>
</span><span class="cx"> <div class="gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMax"></div>
</span><ins>+<div class="gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMax"></div>
</ins><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script src="resources/non-grid-columns-rows-get-set-multiple.js"></script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx"> -webkit-grid-template-columns: minmax(10%, calc(50% + 15px));
</span><span class="cx"> -webkit-grid-template-rows: minmax(calc(20px + 10%), 50%);
</span><span class="cx"> }
</span><ins>+.gridWithAutoInsideMinMax {
+ -webkit-grid-template-columns: minmax(auto, 20px);
+ -webkit-grid-template-rows: minmax(-webkit-min-content, auto);
+}
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -88,6 +92,7 @@
</span><span class="cx"> <div class="gridWithCalcComplex" id="gridWithCalcComplex"></div>
</span><span class="cx"> <div class="gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMax"></div>
</span><span class="cx"> <div class="gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMax"></div>
</span><ins>+<div class="gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMax"></div>
</ins><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script src="resources/non-grid-columns-rows-get-set.js"></script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetmultiplejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcAndFixed"), "50% 80px", "88px 25%", "400px 80px", "88px 150px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcAndMinMax"), "190px minmax(-webkit-min-content, 80px)", "minmax(25%, -webkit-max-content) 53px", "190px 80px", "150px 53px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMax"), "minmax(103px, 400px) 120px", "150px minmax(5%, 175px)", "400px 120px", "150px 175px");
</span><ins>+testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "0px 30px", "132px 60px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="lines">@@ -37,6 +38,7 @@
</span><span class="cx"> testGridTemplatesSetJSValues("16em 2fr", "14fr auto", "160px 640px", "600px 0px");
</span><span class="cx"> testGridTemplatesSetJSValues("calc(25px) calc(2em)", "auto calc(10%)", "25px 20px", "0px 60px", "calc(25px) calc(2em)", "auto calc(10%)");
</span><span class="cx"> testGridTemplatesSetJSValues("calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), -webkit-max-content) auto", "345px 92px", "100px 0px", "calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), -webkit-max-content) auto");
</span><ins>+testGridTemplatesSetJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw", "0px 16px", "90px 80px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values set from CSS");
</span><span class="lines">@@ -51,7 +53,6 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none", "auto none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none 16em", "auto 18em none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
</span><del>-testGridTemplatesSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw");
</del><span class="cx">
</span><span class="cx"> // Negative values are not allowed.
</span><span class="cx"> testGridTemplatesSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcComplexElement"), "550px", "465px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMaxElement"), "minmax(10%, 15px)", "minmax(20px, 50%)", "80px", "300px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcComplexInsideMinMaxElement"), "minmax(10%, 415px)", "minmax(80px, 50%)", "415px", "300px");
</span><ins>+testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMaxElement"), "20px", "11px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values for -webkit-grid-template-columns and -webkit-grid-template-rows through CSS (they should resolve to the default: 'none')");
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> testGridTemplatesSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "48px", "80px");
</span><span class="cx"> testGridTemplatesSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "220px", "50px");
</span><span class="cx"> testGridTemplatesSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)", "0px", "0px");
</span><ins>+testGridTemplatesSetJSValues("minmax(auto, -webkit-max-content)", "minmax(10vw, auto)", "0px", "80px");
</ins><span class="cx"> // Unit comparison should be case-insensitive.
</span><span class="cx"> testGridTemplatesSetJSValues("3600Fr", "154fR", "800px", "600px", "3600fr", "154fr");
</span><span class="cx">
</span><span class="lines">@@ -76,8 +78,6 @@
</span><span class="cx"> // No breadth value and no comma.
</span><span class="cx"> testGridTemplatesSetBadJSValues("minmax()", "minmax(30px 30% 30em)");
</span><span class="cx">
</span><del>-// Auto is not allowed inside minmax.
-testGridTemplatesSetBadJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)");
</del><span class="cx"> testGridTemplatesSetBadJSValues("-2fr", "3ffr");
</span><span class="cx"> testGridTemplatesSetBadJSValues("-2.05fr", "+-3fr");
</span><span class="cx"> testGridTemplatesSetBadJSValues("0fr", "1r");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetmultiplejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcAndFixed"), "50% 80px", "88px 25%");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcAndMinMax"), "calc(30px + 20%) minmax(-webkit-min-content, 80px)", "minmax(25%, -webkit-max-content) calc(10% - 7px)");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMax"), "minmax(calc(23px + 10%), 400px) 120px", "150px minmax(5%, calc(50% - 125px))");
</span><ins>+testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "minmax(auto, 20px) 10%", "-webkit-max-content minmax(-webkit-min-content, auto)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="lines">@@ -34,6 +35,7 @@
</span><span class="cx"> testNonGridTemplatesSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px minmax(16px, 20px)");
</span><span class="cx"> testNonGridTemplatesSetJSValues("16em 2fr", "14fr auto", "160px 2fr");
</span><span class="cx"> testNonGridTemplatesSetJSValues("50% 12vw", "5% 85vh", "50% 96px", "5% 510px");
</span><ins>+testNonGridTemplatesSetJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw", "auto minmax(16px, auto)", "minmax(auto, 15%) 80px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values set from CSS");
</span><span class="lines">@@ -53,7 +55,6 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none", "auto none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none 16em", "auto 18em none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
</span><del>-testGridTemplatesSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw");
</del><span class="cx"> // Negative values are not allowed.
</span><span class="cx"> testGridTemplatesSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
</span><span class="cx"> testGridTemplatesSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcComplex"), "calc(50% + 150px)", "calc(65% + 75px)");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMax"), "minmax(10%, 15px)", "minmax(20px, 50%)");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcComplexInsideMinMax"), "minmax(10%, calc(50% + 15px))", "minmax(calc(20px + 10%), 50%)");
</span><ins>+testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "minmax(auto, 20px)", "minmax(-webkit-min-content, auto)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')");
</span><span class="lines">@@ -54,6 +55,7 @@
</span><span class="cx"> testNonGridTemplatesSetJSValues("3.1459fr", "2.718fr");
</span><span class="cx"> // A leading '+' is allowed.
</span><span class="cx"> testNonGridTemplatesSetJSValues("+3fr", "+4fr", "3fr", "4fr", "3fr", "4fr");
</span><ins>+testNonGridTemplatesSetJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)", "minmax(auto, 48px)", "minmax(80px, auto)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting grid-template-columns and grid-template-rows to bad values through JS");
</span><span class="lines">@@ -63,8 +65,6 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("minmax(minmax(10px, 20px), 20px)", "minmax(10px, 20px, 30px)");
</span><span class="cx"> // No breadth value and no comma.
</span><span class="cx"> testGridTemplatesSetBadJSValues("minmax()", "minmax(30px 30% 30em)");
</span><del>-// Auto is not allowed inside minmax.
-testGridTemplatesSetBadJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)");
</del><span class="cx"> testGridTemplatesSetBadJSValues("-2fr", "3ffr");
</span><span class="cx"> testGridTemplatesSetBadJSValues("-2.05fr", "+-3fr");
</span><span class="cx"> testGridTemplatesSetBadJSValues("0fr", "1r");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/Source/WebCore/ChangeLog 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2015-09-15 Sergio Villar Senin <svillar@igalia.com>
+
+ [CSS Grid Layout] Using automatic (instead of min-content) minimums for 'auto' tracks
+ https://bugs.webkit.org/show_bug.cgi?id=142329
+
+ Reviewed by Darin Adler.
+
+ Based on Blink's r198697 by <svillar@igalia.com> and r200478 by <jfernandez@igalia.com>
+
+ More precisely (syntax-wise), this would allow 'auto' to be used within the
+ minmax() function (it's currently forbidden) and have the 'auto' keyword map
+ to minmax(auto, auto) instead of minmax(min-content, max-content).
+ - As a minimum, 'auto' would mean "use the specified minimum size, or if
+ that is auto, treat as 0 or min-content per Flexbox rules".
+ - As a maximum, 'auto' would mean "use the max-content size".
+
+ Regarding the implementation, a new phase is added to the track sizing
+ algorithm called ResolveIntrinsicMinimums (the former ResolveIntrinsicMinimums
+ is now called ResolveContentBasedMinimums which does not include 'auto'
+ resolution) which will be run before any other. This phase uses the minimum
+ size of grid items (as specified by min-width/height).
+
+ Tests: fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html
+ fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridBreadth):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeUsedBreadthOfMinLength):
+ (WebCore::RenderGrid::computeUsedBreadthOfMaxLength):
+ (WebCore::RenderGrid::minSizeForChild):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
+ (WebCore::RenderGrid::trackSizeForTrackSizeComputationPhase):
+ (WebCore::RenderGrid::shouldProcessTrackForTrackSizeComputationPhase):
+ (WebCore::RenderGrid::trackShouldGrowBeyondGrowthLimitsForTrackSizeComputationPhase):
+ (WebCore::RenderGrid::markAsInfinitelyGrowableForTrackSizeComputationPhase):
+ (WebCore::RenderGrid::updateTrackSizeForTrackSizeComputationPhase):
+ (WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
+ * rendering/RenderGrid.h:
+ * rendering/style/GridTrackSize.h:
+ (WebCore::GridTrackSize::minTrackBreadth):
+ (WebCore::GridTrackSize::maxTrackBreadth):
+ (WebCore::GridTrackSize::cacheMinMaxTrackBreadthTypes):
+ (WebCore::GridTrackSize::hasIntrinsicMinTrackBreadth):
+ (WebCore::GridTrackSize::hasAutoMinTrackBreadth):
+ (WebCore::GridTrackSize::hasAutoMaxTrackBreadth):
+ (WebCore::GridTrackSize::hasMaxContentOrAutoMaxTrackBreadth):
+ (WebCore::GridTrackSize::hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth):
+ (WebCore::GridTrackSize::hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth): Deleted.
+
</ins><span class="cx"> 2015-09-17 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Relayout whenever Box Alignment properties change
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -5743,7 +5743,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> CSSParser::parseGridBreadth(CSSParserValue& value)
</span><span class="cx"> {
</span><del>- if (value.id == CSSValueWebkitMinContent || value.id == CSSValueWebkitMaxContent)
</del><ins>+ if (value.id == CSSValueWebkitMinContent || value.id == CSSValueWebkitMaxContent || value.id == CSSValueAuto)
</ins><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(value.id);
</span><span class="cx">
</span><span class="cx"> if (value.unit == CSSPrimitiveValue::CSS_FR) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -469,11 +469,10 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> const Length& trackLength = gridLength.length();
</span><del>- ASSERT(!trackLength.isAuto());
</del><span class="cx"> if (trackLength.isSpecified())
</span><span class="cx"> return computeUsedBreadthOfSpecifiedLength(direction, trackLength);
</span><span class="cx">
</span><del>- ASSERT(trackLength.isMinContent() || trackLength.isMaxContent());
</del><ins>+ ASSERT(trackLength.isMinContent() || trackLength.isAuto() || trackLength.isMaxContent());
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -483,14 +482,13 @@
</span><span class="cx"> return usedBreadth;
</span><span class="cx">
</span><span class="cx"> const Length& trackLength = gridLength.length();
</span><del>- ASSERT(!trackLength.isAuto());
</del><span class="cx"> if (trackLength.isSpecified()) {
</span><span class="cx"> LayoutUnit computedBreadth = computeUsedBreadthOfSpecifiedLength(direction, trackLength);
</span><span class="cx"> ASSERT(computedBreadth != infinity);
</span><span class="cx"> return computedBreadth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(trackLength.isMinContent() || trackLength.isMaxContent());
</del><ins>+ ASSERT(trackLength.isMinContent() || trackLength.isAuto() || trackLength.isMaxContent());
</ins><span class="cx"> return infinity;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -600,6 +598,25 @@
</span><span class="cx"> return child.logicalHeight() + child.marginLogicalHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutUnit RenderGrid::minSizeForChild(RenderBox& child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
+{
+ bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
+ // FIXME: Properly support orthogonal writing mode.
+ if (hasOrthogonalWritingMode)
+ return { };
+
+ const Length& childMinSize = direction == ForColumns ? child.style().logicalMinWidth() : child.style().logicalMinHeight();
+ if (childMinSize.isAuto()) {
+ // FIXME: Implement intrinsic aspect ratio support (transferred size in specs).
+ return minContentForChild(child, direction, columnTracks);
+ }
+
+ if (direction == ForColumns)
+ return child.computeLogicalWidthInRegionUsing(MinSize, childMinSize, contentLogicalWidth(), this, nullptr);
+
+ return child.computeContentAndScrollbarLogicalHeightUsing(MinSize, childMinSize, child.logicalHeight()).valueOr(0);
+}
+
</ins><span class="cx"> LayoutUnit RenderGrid::minContentForChild(RenderBox& child, GridTrackSizingDirection direction, Vector<GridTrack>& columnTracks)
</span><span class="cx"> {
</span><span class="cx"> bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
</span><span class="lines">@@ -716,6 +733,7 @@
</span><span class="cx"> while (it != end) {
</span><span class="cx"> GridItemsSpanGroupRange spanGroupRange = { it, std::upper_bound(it, end, *it) };
</span><span class="cx"> resolveContentBasedTrackSizingFunctionsForItems<ResolveIntrinsicMinimums>(direction, sizingData, spanGroupRange);
</span><ins>+ resolveContentBasedTrackSizingFunctionsForItems<ResolveContentBasedMinimums>(direction, sizingData, spanGroupRange);
</ins><span class="cx"> resolveContentBasedTrackSizingFunctionsForItems<ResolveMaxContentMinimums>(direction, sizingData, spanGroupRange);
</span><span class="cx"> resolveContentBasedTrackSizingFunctionsForItems<ResolveIntrinsicMaximums>(direction, sizingData, spanGroupRange);
</span><span class="cx"> resolveContentBasedTrackSizingFunctionsForItems<ResolveMaxContentMaximums>(direction, sizingData, spanGroupRange);
</span><span class="lines">@@ -738,10 +756,12 @@
</span><span class="cx"> track.setBaseSize(std::max(track.baseSize(), minContentForChild(gridItem, direction, columnTracks)));
</span><span class="cx"> else if (trackSize.hasMaxContentMinTrackBreadth())
</span><span class="cx"> track.setBaseSize(std::max(track.baseSize(), maxContentForChild(gridItem, direction, columnTracks)));
</span><ins>+ else if (trackSize.hasAutoMinTrackBreadth())
+ track.setBaseSize(std::max(track.baseSize(), minSizeForChild(gridItem, direction, columnTracks)));
</ins><span class="cx">
</span><span class="cx"> if (trackSize.hasMinContentMaxTrackBreadth())
</span><span class="cx"> track.setGrowthLimit(std::max(track.growthLimit(), minContentForChild(gridItem, direction, columnTracks)));
</span><del>- else if (trackSize.hasMaxContentMaxTrackBreadth())
</del><ins>+ else if (trackSize.hasMaxContentOrAutoMaxTrackBreadth())
</ins><span class="cx"> track.setGrowthLimit(std::max(track.growthLimit(), maxContentForChild(gridItem, direction, columnTracks)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -749,6 +769,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (phase) {
</span><span class="cx"> case ResolveIntrinsicMinimums:
</span><ins>+ case ResolveContentBasedMinimums:
</ins><span class="cx"> case ResolveMaxContentMinimums:
</span><span class="cx"> case MaximizeTracks:
</span><span class="cx"> return track.baseSize();
</span><span class="lines">@@ -765,13 +786,15 @@
</span><span class="cx"> {
</span><span class="cx"> switch (phase) {
</span><span class="cx"> case ResolveIntrinsicMinimums:
</span><ins>+ return trackSize.hasIntrinsicMinTrackBreadth();
+ case ResolveContentBasedMinimums:
</ins><span class="cx"> return trackSize.hasMinOrMaxContentMinTrackBreadth();
</span><span class="cx"> case ResolveMaxContentMinimums:
</span><span class="cx"> return trackSize.hasMaxContentMinTrackBreadth();
</span><span class="cx"> case ResolveIntrinsicMaximums:
</span><span class="cx"> return trackSize.hasMinOrMaxContentMaxTrackBreadth();
</span><span class="cx"> case ResolveMaxContentMaximums:
</span><del>- return trackSize.hasMaxContentMaxTrackBreadth();
</del><ins>+ return trackSize.hasMaxContentOrAutoMaxTrackBreadth();
</ins><span class="cx"> case MaximizeTracks:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="lines">@@ -785,7 +808,8 @@
</span><span class="cx"> {
</span><span class="cx"> switch (phase) {
</span><span class="cx"> case ResolveIntrinsicMinimums:
</span><del>- return trackSize.hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth();
</del><ins>+ case ResolveContentBasedMinimums:
+ return trackSize.hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth();
</ins><span class="cx"> case ResolveMaxContentMinimums:
</span><span class="cx"> return trackSize.hasMaxContentMinTrackBreadthAndMaxContentMaxTrackBreadth();
</span><span class="cx"> case ResolveIntrinsicMaximums:
</span><span class="lines">@@ -804,6 +828,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (phase) {
</span><span class="cx"> case ResolveIntrinsicMinimums:
</span><ins>+ case ResolveContentBasedMinimums:
</ins><span class="cx"> case ResolveMaxContentMinimums:
</span><span class="cx"> return;
</span><span class="cx"> case ResolveIntrinsicMaximums:
</span><span class="lines">@@ -826,6 +851,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (phase) {
</span><span class="cx"> case ResolveIntrinsicMinimums:
</span><ins>+ case ResolveContentBasedMinimums:
</ins><span class="cx"> case ResolveMaxContentMinimums:
</span><span class="cx"> track.setBaseSize(track.plannedSize());
</span><span class="cx"> return;
</span><span class="lines">@@ -845,6 +871,8 @@
</span><span class="cx"> {
</span><span class="cx"> switch (phase) {
</span><span class="cx"> case ResolveIntrinsicMinimums:
</span><ins>+ return minSizeForChild(gridItem, direction, columnTracks);
+ case ResolveContentBasedMinimums:
</ins><span class="cx"> case ResolveIntrinsicMaximums:
</span><span class="cx"> return minContentForChild(gridItem, direction, columnTracks);
</span><span class="cx"> case ResolveMaxContentMinimums:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> };
</span><span class="cx"> enum TrackSizeComputationPhase {
</span><span class="cx"> ResolveIntrinsicMinimums,
</span><ins>+ ResolveContentBasedMinimums,
</ins><span class="cx"> ResolveMaxContentMinimums,
</span><span class="cx"> ResolveIntrinsicMaximums,
</span><span class="cx"> ResolveMaxContentMaximums,
</span><span class="lines">@@ -117,6 +118,7 @@
</span><span class="cx"> GridTrackSize gridTrackSize(GridTrackSizingDirection, unsigned) const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalContentHeightForChild(RenderBox&, Vector<GridTrack>&);
</span><ins>+ LayoutUnit minSizeForChild(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
</ins><span class="cx"> LayoutUnit minContentForChild(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
</span><span class="cx"> LayoutUnit maxContentForChild(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
</span><span class="cx"> GridAxisPosition columnAxisPositionForChild(const RenderBox&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridTrackSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridTrackSize.h (189910 => 189911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridTrackSize.h 2015-09-17 09:13:35 UTC (rev 189910)
+++ trunk/Source/WebCore/rendering/style/GridTrackSize.h 2015-09-17 12:13:30 UTC (rev 189911)
</span><span class="lines">@@ -70,23 +70,9 @@
</span><span class="cx"> return minTrackBreadth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const GridLength& minTrackBreadth() const
- {
- if (m_minTrackBreadth.isLength() && m_minTrackBreadth.length().isAuto()) {
- static NeverDestroyed<const GridLength> minContent{Length(MinContent)};
- return minContent;
- }
- return m_minTrackBreadth;
- }
</del><ins>+ const GridLength& minTrackBreadth() const { return m_minTrackBreadth; }
</ins><span class="cx">
</span><del>- const GridLength& maxTrackBreadth() const
- {
- if (m_maxTrackBreadth.isLength() && m_maxTrackBreadth.length().isAuto()) {
- static NeverDestroyed<const GridLength> maxContent{Length(MaxContent)};
- return maxContent;
- }
- return m_maxTrackBreadth;
- }
</del><ins>+ const GridLength& maxTrackBreadth() const { return m_maxTrackBreadth; }
</ins><span class="cx">
</span><span class="cx"> GridTrackSizeType type() const { return m_type; }
</span><span class="cx">
</span><span class="lines">@@ -101,27 +87,35 @@
</span><span class="cx">
</span><span class="cx"> void cacheMinMaxTrackBreadthTypes()
</span><span class="cx"> {
</span><ins>+ m_minTrackBreadthIsAuto = minTrackBreadth().isLength() && minTrackBreadth().length().isAuto();
</ins><span class="cx"> m_minTrackBreadthIsMinContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMinContent();
</span><span class="cx"> m_minTrackBreadthIsMaxContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMaxContent();
</span><span class="cx"> m_maxTrackBreadthIsMaxContent = maxTrackBreadth().isLength() && maxTrackBreadth().length().isMaxContent();
</span><span class="cx"> m_maxTrackBreadthIsMinContent = maxTrackBreadth().isLength() && maxTrackBreadth().length().isMinContent();
</span><ins>+ m_maxTrackBreadthIsAuto = maxTrackBreadth().isLength() && maxTrackBreadth().length().isAuto();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool hasIntrinsicMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent || m_minTrackBreadthIsAuto; }
</ins><span class="cx"> bool hasMinOrMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent; }
</span><ins>+ bool hasAutoMinTrackBreadth() const { return m_minTrackBreadthIsAuto; }
+ bool hasAutoMaxTrackBreadth() const { return m_maxTrackBreadthIsAuto; }
</ins><span class="cx"> bool hasMaxContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMaxContent; }
</span><ins>+ bool hasMaxContentOrAutoMaxTrackBreadth() const { return m_maxTrackBreadthIsMaxContent || m_maxTrackBreadthIsAuto; }
</ins><span class="cx"> bool hasMinContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMinContent; }
</span><span class="cx"> bool hasMinOrMaxContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMaxContent || m_maxTrackBreadthIsMinContent; }
</span><span class="cx"> bool hasMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent; }
</span><span class="cx"> bool hasMinContentMinTrackBreadth() const { return m_minTrackBreadthIsMinContent; }
</span><del>- bool hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMinContent && hasMinOrMaxContentMaxTrackBreadth(); }
</del><span class="cx"> bool hasMaxContentMinTrackBreadthAndMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMaxContent && m_maxTrackBreadthIsMaxContent; }
</span><ins>+ bool hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth() const { return (m_minTrackBreadthIsMinContent || m_minTrackBreadthIsAuto) && (m_maxTrackBreadthIsAuto || hasMinOrMaxContentMaxTrackBreadth()); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> GridTrackSizeType m_type;
</span><span class="cx"> GridLength m_minTrackBreadth;
</span><span class="cx"> GridLength m_maxTrackBreadth;
</span><ins>+ bool m_minTrackBreadthIsAuto;
</ins><span class="cx"> bool m_minTrackBreadthIsMaxContent;
</span><span class="cx"> bool m_minTrackBreadthIsMinContent;
</span><ins>+ bool m_maxTrackBreadthIsAuto;
</ins><span class="cx"> bool m_maxTrackBreadthIsMaxContent;
</span><span class="cx"> bool m_maxTrackBreadthIsMinContent;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>