Diff
Modified: trunk/LayoutTests/ChangeLog (202973 => 202974)
--- trunk/LayoutTests/ChangeLog 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/ChangeLog 2016-07-08 10:11:10 UTC (rev 202974)
@@ -1,3 +1,28 @@
+2016-07-08 Manuel Rego Casasnovas <[email protected]>
+
+ [css-grid] Inline size is never indefinite during layout
+ https://bugs.webkit.org/show_bug.cgi?id=159253
+
+ Reviewed by Sergio Villar Senin.
+
+ Created a new test verifying the expected behavior. Updated the results
+ in a few tests too.
+
+ * 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/grid-container-percentage-columns-expected.txt: Added.
+ * fast/css-grid-layout/grid-container-percentage-columns.html: Added.
+ * fast/css-grid-layout/named-grid-line-get-set-expected.txt:
+ * fast/css-grid-layout/named-grid-line-get-set.html:
+ * fast/css-grid-layout/percent-track-breadths-regarding-container-size-expected.txt:
+ * fast/css-grid-layout/percent-track-breadths-regarding-container-size.html:
+ The results of this test now show some FAIL messages becase of a bug in
+ RenderBox::hasDefiniteLogicalHeight() (http://webkit.org/b/159251).
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
+
2016-07-08 Frederic Wang <[email protected]>
Use OpenType MATH constant AxisHeight.
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2016-07-08 10:11:10 UTC (rev 202974)
@@ -8,11 +8,11 @@
PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-rows') is "none"
PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "10px"
PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "400px"
PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px"
PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "0px"
PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "7px"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "3.5px"
PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-rows') is "11px"
PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "0px"
PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px"
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2016-07-08 10:11:10 UTC (rev 202974)
@@ -6,9 +6,9 @@
Test getting |grid-template-columns| and |grid-template-rows| set through CSS
PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "7px 11px"
PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px 792px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "400px 800px"
PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px 312px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "7px 0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "3.5px 7px"
PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "11px 0px"
PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "0px 17px"
PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px 3px"
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2016-07-08 10:11:10 UTC (rev 202974)
@@ -27,7 +27,7 @@
grid-template-rows: 17px 2px;
}
.gridWithPercent {
- grid-template-columns: 53% 99%;
+ grid-template-columns: 50% 100%;
grid-template-rows: 27% 52%;
}
.gridWithAuto {
Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2016-07-08 10:11:10 UTC (rev 202974)
@@ -31,7 +31,7 @@
grid-template-rows: 15px;
}
.gridWithPercent {
- grid-template-columns: 53%;
+ grid-template-columns: 50%;
grid-template-rows: 27%;
}
.gridWithAuto {
Added: trunk/LayoutTests/fast/css-grid-layout/grid-container-percentage-columns-expected.txt (0 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/grid-container-percentage-columns-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-container-percentage-columns-expected.txt 2016-07-08 10:11:10 UTC (rev 202974)
@@ -0,0 +1,42 @@
+This test checks that percentage columns are only indefinite during intrinsic size computation. Aftewards, they are properly resolved against the grid container intrinsic sizes.
+
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
+XX X
+PASS
Added: trunk/LayoutTests/fast/css-grid-layout/grid-container-percentage-columns.html (0 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/grid-container-percentage-columns.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-container-percentage-columns.html 2016-07-08 10:11:10 UTC (rev 202974)
@@ -0,0 +1,254 @@
+<!DOCTYPE html>
+<link href="" rel="stylesheet">
+<link href="" rel="stylesheet">
+<style>
+.wrapper {
+ position: relative;
+ clear: both;
+}
+
+.grid {
+ font: 10px/1 Ahem;
+}
+
+.float {
+ float: left;
+}
+
+.abspos {
+ position: absolute;
+}
+
+.fixedSize {
+ width: 200px;
+ height: 200px;
+}
+
+.oneColumn100 {
+ grid-template-columns: 100%;
+}
+
+.oneColumn50 {
+ grid-template-columns: 50%;
+}
+
+.twoColumns {
+ grid-template-columns: 50% 100px;
+}
+</style>
+<script src=""
+<body _onload_="checkLayout('.grid')">
+
+<p>This test checks that percentage columns are only indefinite during intrinsic size computation. Aftewards, they are properly resolved against the grid container intrinsic sizes.</p>
+
+<div class="wrapper">
+ <div class="grid float oneColumn100" data-expected-width="40" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid abspos oneColumn100" data-expected-width="40" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid max-content oneColumn100" data-expected-width="40" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid fit-content oneColumn100" data-expected-width="40" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid min-content oneColumn100" data-expected-width="20" data-expected-height="20">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="20">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid float oneColumn50" data-expected-width="40" data-expected-height="20">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="20">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid abspos oneColumn50" data-expected-width="40" data-expected-height="20">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="20">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid max-content oneColumn50" data-expected-width="40" data-expected-height="20">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="20">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid fit-content oneColumn50" data-expected-width="40" data-expected-height="20">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="20">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid min-content oneColumn50" data-expected-width="20" data-expected-height="20">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="20">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid float twoColumns" data-expected-width="140" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="70" data-expected-height="10">
+ XX X
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="70" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid abspos twoColumns" data-expected-width="140" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="70" data-expected-height="10">
+ XX X
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="70" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid max-content twoColumns" data-expected-width="140" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="70" data-expected-height="10">
+ XX X
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="70" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid fit-content twoColumns" data-expected-width="140" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="70" data-expected-height="10">
+ XX X
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="70" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid min-content twoColumns" data-expected-width="120" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="60" data-expected-height="10">
+ XX X
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="60" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid float twoColumns" data-expected-width="100" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="10">
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid abspos twoColumns" data-expected-width="100" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="10">
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid max-content twoColumns" data-expected-width="100" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="10">
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid min-content twoColumns" data-expected-width="100" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="10">
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+<div class="wrapper">
+ <div class="grid fit-content twoColumns" data-expected-width="100" data-expected-height="10">
+ <div class="firstRowFirstColumn"
+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="10">
+ </div>
+ <div class="firstRowSecondColumn"
+ data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="10">
+ XX X
+ </div>
+ </div>
+</div>
+
+</body>
Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt 2016-07-08 10:11:10 UTC (rev 202974)
@@ -6,11 +6,11 @@
Test getting grid-template-columns and grid-template-rows set through CSS
PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "[first] 10px"
PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "[first] 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px [last]"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "400px [last]"
PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px [last]"
PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "0px [last]"
PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "0px [last]"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "77px [last]"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "38.5px [last]"
PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-rows') is "22px [last]"
PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "[first] 0px"
PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px [last]"
Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2016-07-08 10:11:10 UTC (rev 202974)
@@ -21,7 +21,7 @@
grid-template-rows: [first] 15px;
}
.gridWithPercent {
- grid-template-columns: 53% [last];
+ grid-template-columns: 50% [last];
grid-template-rows: 27% [last];
}
.gridWithAuto {
@@ -99,9 +99,9 @@
debug("Test getting grid-template-columns and grid-template-rows set through CSS");
testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "[first] 10px", "[first] 15px");
- testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "424px [last]", "162px [last]");
+ testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "400px [last]", "162px [last]");
testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSize"), "0px [last]", "0px [last]");
- testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSizeWithChildren"), "77px [last]", "22px [last]");
+ testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSizeWithChildren"), "38.5px [last]", "22px [last]");
testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "[first] 0px", "0px [last]");
testGridTemplatesValues(document.getElementById("gridWithAutoWithChildrenElement"), "[first] 77px", "22px [last]");
testGridTemplatesValues(document.getElementById("gridWithMinMax"), "[first] 80px", "300px [last]");
Modified: trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size-expected.txt (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size-expected.txt 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size-expected.txt 2016-07-08 10:11:10 UTC (rev 202974)
@@ -35,11 +35,29 @@
XX
XXXXX
XXX
-PASS
+FAIL:
+Expected 10 for height, but got 4.
+Expected 10 for height, but got 4.
+Expected 10 for height, but got 4.
+
+<div class="grid absolutelyPositioned">
+ <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
+ <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
+ <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
+ </div>
XX
XXXXX
XXX
-PASS
+FAIL:
+Expected 10 for height, but got 4.
+Expected 10 for height, but got 4.
+Expected 10 for height, but got 4.
+
+<div class="grid absolutelyPositioned">
+ <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
+ <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
+ <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
+ </div>
XX
XXXXX
XXX
Modified: trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html 2016-07-08 10:11:10 UTC (rev 202974)
@@ -89,9 +89,9 @@
<div class="fit-content indefiniteHeight">
<div class="grid calculatedSize justifyContentStart">
- <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
- <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
- <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
+ <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="44" data-expected-height="10">XX</div>
+ <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="110" data-expected-height="10">XXXXX</div>
+ <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="66" data-expected-height="10">XXX</div>
</div>
</div>
@@ -105,9 +105,9 @@
<div class="fit-content indefiniteHeight">
<div class="grid percentageSize">
- <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
- <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
- <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
+ <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="10" data-expected-height="10">XX</div>
+ <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="25" data-expected-height="10">XXXXX</div>
+ <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="15" data-expected-height="10">XXX</div>
</div>
</div>
@@ -119,19 +119,22 @@
</div>
</div>
+ <!-- FIXME: The height of the row is wrong calculated in the following 2 examples because of a bug in
+ RenderBox::hasDefiniteLogicalHeight() that considers that any positioned element has a definite height.
+ See: https://bugs.webkit.org/show_bug.cgi?id=159251 -->
<div class="fit-content indefiniteHeight">
<div class="grid absolutelyPositioned">
- <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="0" data-expected-height="0">XX</div>
- <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="0" data-expected-height="0">XXXXX</div>
- <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="0" data-expected-height="0">XXX</div>
+ <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
+ <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
+ <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
</div>
</div>
<div class="unconstrainedContainer">
<div class="grid absolutelyPositioned">
- <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="0" data-expected-height="0">XX</div>
- <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="0" data-expected-height="0">XXXXX</div>
- <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="0" data-expected-height="0">XXX</div>
+ <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
+ <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
+ <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
</div>
</div>
Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2016-07-08 10:11:10 UTC (rev 202974)
@@ -2,8 +2,8 @@
debug("Test getting |grid-template-columns| and |grid-template-rows| set through CSS");
testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "7px 11px", "17px 2px");
-testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%", "424px 792px", "162px 312px");
-testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSize"), "53% 99%", "27% 52%", "7px 0px", "11px 0px");
+testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "50% 100%", "27% 52%", "400px 800px", "162px 312px");
+testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSize"), "50% 100%", "27% 52%", "3.5px 7px", "11px 0px");
testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "auto auto", "auto auto", "0px 17px", "0px 3px");
testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px 120px", "150px 170px");
testGridTemplatesValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto", "15px 0px 100px", "120px 18px 0px");
Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js (202973 => 202974)
--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2016-07-08 10:11:10 UTC (rev 202974)
@@ -3,9 +3,9 @@
debug("Test getting grid-template-columns and grid-template-rows set through CSS");
testGridTemplatesValues(document.getElementById("gridWithNoneElement"), "none", "none");
testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
-testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "424px", "162px");
+testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "400px", "162px");
testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSize"), "0px", "0px");
-testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSizeWithChildren"), "7px", "11px");
+testGridTemplatesValues(document.getElementById("gridWithPercentWithoutSizeWithChildren"), "3.5px", "11px");
testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "0px", "0px");
testGridTemplatesValues(document.getElementById("gridWithAutoWithChildrenElement"), "7px", "11px");
testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px", "150px");
Modified: trunk/Source/WebCore/ChangeLog (202973 => 202974)
--- trunk/Source/WebCore/ChangeLog 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 10:11:10 UTC (rev 202974)
@@ -1,3 +1,35 @@
+2016-07-08 Manuel Rego Casasnovas <[email protected]>
+
+ [css-grid] Inline size is never indefinite during layout
+ https://bugs.webkit.org/show_bug.cgi?id=159253
+
+ Reviewed by Sergio Villar Senin.
+
+ The issue is that the inline size of the grid container
+ is only indefinite while we're computing the intrinsic sizes.
+ During layout we should be able to resolve the percentage tracks
+ against that size. This makes Grid Layout compatible with regular blocks
+ regarding how inline percentages are resolved.
+
+ The patch passes the SizingOperation enum to RenderGrid::gridTrackSize().
+ That way we can know if we're computing the intrinsic sizes or not.
+
+ Test: fast/css-grid-layout/grid-container-percentage-columns.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeTrackSizesForDirection):
+ (WebCore::RenderGrid::computeIntrinsicLogicalWidths):
+ (WebCore::RenderGrid::computeIntrinsicLogicalHeight):
+ (WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
+ (WebCore::RenderGrid::gridTrackSize):
+ (WebCore::RenderGrid::minSizeForChild):
+ (WebCore::RenderGrid::spanningItemCrossesFlexibleSizedTracks):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
+ (WebCore::RenderGrid::tracksAreWiderThanMinTrackBreadth):
+ (WebCore::RenderGrid::rawGridTrackSize): Deleted.
+ * rendering/RenderGrid.h:
+
2016-07-08 Frederic Wang <[email protected]>
Use OpenType MATH constant AxisHeight.
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (202973 => 202974)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-07-08 10:11:10 UTC (rev 202974)
@@ -238,7 +238,6 @@
Optional<LayoutUnit> freeSpaceForDirection(GridTrackSizingDirection direction) { return direction == ForColumns ? freeSpaceForColumns : freeSpaceForRows; }
void setFreeSpaceForDirection(GridTrackSizingDirection, Optional<LayoutUnit> freeSpace);
- enum SizingOperation { TrackSizing, IntrinsicSizeComputation };
SizingOperation sizingOperation { TrackSizing };
private:
@@ -360,7 +359,7 @@
{
LayoutUnit totalGuttersSize = guttersSize(direction, direction == ForRows ? gridRowCount() : gridColumnCount());
sizingData.setFreeSpaceForDirection(direction, freeSpace - totalGuttersSize);
- sizingData.sizingOperation = GridSizingData::TrackSizing;
+ sizingData.sizingOperation = TrackSizing;
LayoutUnit baseSizes, growthLimits;
computeUsedBreadthOfGridTracks(direction, sizingData, baseSizes, growthLimits);
@@ -465,7 +464,7 @@
GridSizingData sizingData(gridColumnCount(), gridRowCount());
sizingData.setFreeSpaceForDirection(ForColumns, Nullopt);
- sizingData.sizingOperation = GridSizingData::IntrinsicSizeComputation;
+ sizingData.sizingOperation = IntrinsicSizeComputation;
const_cast<RenderGrid*>(this)->computeUsedBreadthOfGridTracks(ForColumns, sizingData, minLogicalWidth, maxLogicalWidth);
LayoutUnit totalGuttersSize = guttersSize(ForColumns, sizingData.columnTracks.size());
@@ -484,7 +483,7 @@
{
ASSERT(tracksAreWiderThanMinTrackBreadth(ForColumns, sizingData));
sizingData.setFreeSpaceForDirection(ForRows, Nullopt);
- sizingData.sizingOperation = GridSizingData::IntrinsicSizeComputation;
+ sizingData.sizingOperation = IntrinsicSizeComputation;
LayoutUnit minHeight, maxHeight;
computeUsedBreadthOfGridTracks(ForRows, sizingData, minHeight, maxHeight);
@@ -547,7 +546,7 @@
// 1. Initialize per Grid track variables.
for (unsigned i = 0; i < tracks.size(); ++i) {
GridTrack& track = tracks[i];
- const GridTrackSize& trackSize = gridTrackSize(direction, i);
+ const GridTrackSize& trackSize = gridTrackSize(direction, i, sizingData.sizingOperation);
const GridLength& minTrackBreadth = trackSize.minTrackBreadth();
const GridLength& maxTrackBreadth = trackSize.maxTrackBreadth();
@@ -607,10 +606,10 @@
// 4. Grow all Grid tracks having a fraction as the MaxTrackSizingFunction.
double flexFraction = 0;
if (hasDefiniteFreeSpace)
- flexFraction = findFlexFactorUnitSize(tracks, GridSpan::translatedDefiniteGridSpan(0, tracks.size()), direction, initialFreeSpace.value());
+ flexFraction = findFlexFactorUnitSize(tracks, GridSpan::translatedDefiniteGridSpan(0, tracks.size()), direction, sizingData.sizingOperation, initialFreeSpace.value());
else {
for (const auto& trackIndex : flexibleSizedTracksIndex)
- flexFraction = std::max(flexFraction, normalizedFlexFraction(tracks[trackIndex], gridTrackSize(direction, trackIndex).maxTrackBreadth().flex()));
+ flexFraction = std::max(flexFraction, normalizedFlexFraction(tracks[trackIndex], gridTrackSize(direction, trackIndex, sizingData.sizingOperation).maxTrackBreadth().flex()));
if (!m_gridItemArea.isEmpty()) {
for (unsigned i = 0; i < flexibleSizedTracksIndex.size(); ++i) {
@@ -622,7 +621,7 @@
if (i > 0 && span.startLine() <= flexibleSizedTracksIndex[i - 1])
continue;
- flexFraction = std::max(flexFraction, findFlexFactorUnitSize(tracks, span, direction, maxContentForChild(*gridItem, direction, sizingData)));
+ flexFraction = std::max(flexFraction, findFlexFactorUnitSize(tracks, span, direction, sizingData.sizingOperation, maxContentForChild(*gridItem, direction, sizingData)));
}
}
}
@@ -629,7 +628,7 @@
}
for (auto trackIndex : flexibleSizedTracksIndex) {
- const GridTrackSize& trackSize = gridTrackSize(direction, trackIndex);
+ const GridTrackSize& trackSize = gridTrackSize(direction, trackIndex, sizingData.sizingOperation);
GridTrack& track = tracks[trackIndex];
LayoutUnit oldBaseSize = track.baseSize();
LayoutUnit baseSize = std::max<LayoutUnit>(oldBaseSize, flexFraction * trackSize.maxTrackBreadth().flex());
@@ -670,7 +669,7 @@
return infinity;
}
-double RenderGrid::computeFlexFactorUnitSize(const Vector<GridTrack>& tracks, GridTrackSizingDirection direction, double flexFactorSum, LayoutUnit leftOverSpace, const Vector<unsigned, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible) const
+double RenderGrid::computeFlexFactorUnitSize(const Vector<GridTrack>& tracks, GridTrackSizingDirection direction, SizingOperation sizingOperation, double flexFactorSum, LayoutUnit leftOverSpace, const Vector<unsigned, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible) const
{
// We want to avoid the effect of flex factors sum below 1 making the factor unit size to grow exponentially.
double hypotheticalFactorUnitSize = leftOverSpace / std::max<double>(1, flexFactorSum);
@@ -681,7 +680,7 @@
if (tracksToTreatAsInflexible && tracksToTreatAsInflexible->contains(index))
continue;
LayoutUnit baseSize = tracks[index].baseSize();
- double flexFactor = gridTrackSize(direction, index).maxTrackBreadth().flex();
+ double flexFactor = gridTrackSize(direction, index, sizingOperation).maxTrackBreadth().flex();
// treating all such tracks as inflexible.
if (baseSize > hypotheticalFactorUnitSize * flexFactor) {
leftOverSpace -= baseSize;
@@ -693,11 +692,11 @@
}
}
if (!validFlexFactorUnit)
- return computeFlexFactorUnitSize(tracks, direction, flexFactorSum, leftOverSpace, flexibleTracksIndexes, WTFMove(tracksToTreatAsInflexible));
+ return computeFlexFactorUnitSize(tracks, direction, sizingOperation, flexFactorSum, leftOverSpace, flexibleTracksIndexes, WTFMove(tracksToTreatAsInflexible));
return hypotheticalFactorUnitSize;
}
-double RenderGrid::findFlexFactorUnitSize(const Vector<GridTrack>& tracks, const GridSpan& tracksSpan, GridTrackSizingDirection direction, LayoutUnit leftOverSpace) const
+double RenderGrid::findFlexFactorUnitSize(const Vector<GridTrack>& tracks, const GridSpan& tracksSpan, GridTrackSizingDirection direction, SizingOperation sizingOperation, LayoutUnit leftOverSpace) const
{
if (leftOverSpace <= 0)
return 0;
@@ -705,7 +704,7 @@
double flexFactorSum = 0;
Vector<unsigned, 8> flexibleTracksIndexes;
for (auto trackIndex : tracksSpan) {
- GridTrackSize trackSize = gridTrackSize(direction, trackIndex);
+ GridTrackSize trackSize = gridTrackSize(direction, trackIndex, sizingOperation);
if (!trackSize.maxTrackBreadth().isFlex())
leftOverSpace -= tracks[trackIndex].baseSize();
else {
@@ -718,14 +717,9 @@
// The function is not called if we don't have <flex> grid tracks
ASSERT(!flexibleTracksIndexes.isEmpty());
- return computeFlexFactorUnitSize(tracks, direction, flexFactorSum, leftOverSpace, flexibleTracksIndexes);
+ return computeFlexFactorUnitSize(tracks, direction, sizingOperation, flexFactorSum, leftOverSpace, flexibleTracksIndexes);
}
-bool RenderGrid::hasDefiniteLogicalSize(GridTrackSizingDirection direction) const
-{
- return (direction == ForRows) ? hasDefiniteLogicalHeight() : hasDefiniteLogicalWidth();
-}
-
const GridTrackSize& RenderGrid::rawGridTrackSize(GridTrackSizingDirection direction, unsigned translatedIndex) const
{
bool isRowAxis = direction == ForColumns;
@@ -757,7 +751,7 @@
return trackStyles[untranslatedIndex - repetitions];
}
-GridTrackSize RenderGrid::gridTrackSize(GridTrackSizingDirection direction, unsigned translatedIndex) const
+GridTrackSize RenderGrid::gridTrackSize(GridTrackSizingDirection direction, unsigned translatedIndex, SizingOperation sizingOperation) const
{
auto& trackSize = rawGridTrackSize(direction, translatedIndex);
@@ -765,7 +759,9 @@
GridLength maxTrackBreadth = trackSize.maxTrackBreadth();
if (minTrackBreadth.isPercentage() || maxTrackBreadth.isPercentage()) {
- if (!hasDefiniteLogicalSize(direction)) {
+ // If the logical width/height of the grid container is indefinite, percentage values are treated as <auto>.
+ // For the inline axis this only happens when we're computing the intrinsic sizes (IntrinsicSizeComputation).
+ if (sizingOperation == IntrinsicSizeComputation || (direction == ForRows && !hasDefiniteLogicalHeight())) {
if (minTrackBreadth.isPercentage())
minTrackBreadth = Length(Auto);
if (maxTrackBreadth.isPercentage())
@@ -816,7 +812,7 @@
bool overrideLogicalWidthHasChanged = updateOverrideContainingBlockContentLogicalWidthForChild(child, sizingData);
if (isRowAxis) {
- LayoutUnit marginLogicalWidth = sizingData.sizingOperation == GridSizingData::TrackSizing ? computeMarginLogicalSizeForChild(ForColumns, child) : marginIntrinsicLogicalWidthForChild(child);
+ LayoutUnit marginLogicalWidth = sizingData.sizingOperation == TrackSizing ? computeMarginLogicalSizeForChild(ForColumns, child) : marginIntrinsicLogicalWidthForChild(child);
return child.computeLogicalWidthInRegionUsing(MinSize, childMinSize, child.overrideContainingBlockContentLogicalWidth().valueOr(0), *this, nullptr) + marginLogicalWidth;
}
@@ -903,10 +899,10 @@
GridSpan m_span;
};
-bool RenderGrid::spanningItemCrossesFlexibleSizedTracks(const GridSpan& itemSpan, GridTrackSizingDirection direction) const
+bool RenderGrid::spanningItemCrossesFlexibleSizedTracks(const GridSpan& itemSpan, GridTrackSizingDirection direction, SizingOperation sizingOperation) const
{
for (auto trackPosition : itemSpan) {
- const GridTrackSize& trackSize = gridTrackSize(direction, trackPosition);
+ const GridTrackSize& trackSize = gridTrackSize(direction, trackPosition, sizingOperation);
if (trackSize.minTrackBreadth().isFlex() || trackSize.maxTrackBreadth().isFlex())
return true;
}
@@ -933,7 +929,7 @@
GridSpan span = cachedGridSpan(*gridItem, direction);
if (span.integerSpan() == 1)
resolveContentBasedTrackSizingFunctionsForNonSpanningItems(direction, span, *gridItem, track, sizingData);
- else if (!spanningItemCrossesFlexibleSizedTracks(span, direction))
+ else if (!spanningItemCrossesFlexibleSizedTracks(span, direction, sizingData.sizingOperation))
sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, span));
}
}
@@ -963,7 +959,7 @@
void RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan& span, RenderBox& gridItem, GridTrack& track, GridSizingData& sizingData)
{
unsigned trackPosition = span.startLine();
- GridTrackSize trackSize = gridTrackSize(direction, trackPosition);
+ GridTrackSize trackSize = gridTrackSize(direction, trackPosition, sizingData.sizingOperation);
if (trackSize.hasMinContentMinTrackBreadth())
track.setBaseSize(std::max(track.baseSize(), minContentForChild(gridItem, direction, sizingData)));
@@ -1118,7 +1114,7 @@
sizingData.growBeyondGrowthLimitsTracks.shrink(0);
LayoutUnit spanningTracksSize;
for (auto trackPosition : itemSpan) {
- const GridTrackSize& trackSize = gridTrackSize(direction, trackPosition);
+ const GridTrackSize& trackSize = gridTrackSize(direction, trackPosition, sizingData.sizingOperation);
GridTrack& track = (direction == ForColumns) ? sizingData.columnTracks[trackPosition] : sizingData.rowTracks[trackPosition];
spanningTracksSize += trackSizeForTrackSizeComputationPhase(phase, track, ForbidInfinity);
if (!shouldProcessTrackForTrackSizeComputationPhase(phase, trackSize))
@@ -1209,7 +1205,7 @@
const Vector<GridTrack>& tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
const LayoutUnit maxSize = sizingData.freeSpaceForDirection(direction).valueOr(0);
for (unsigned i = 0; i < tracks.size(); ++i) {
- const GridTrackSize& trackSize = gridTrackSize(direction, i);
+ const GridTrackSize& trackSize = gridTrackSize(direction, i, sizingData.sizingOperation);
const GridLength& minTrackBreadth = trackSize.minTrackBreadth();
if (computeUsedBreadthOfMinLength(minTrackBreadth, maxSize) > tracks[i].baseSize())
return false;
@@ -1560,7 +1556,7 @@
Vector<GridTrack>& tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
Vector<unsigned> autoSizedTracksIndex;
for (unsigned i = 0; i < tracks.size(); ++i) {
- const GridTrackSize& trackSize = gridTrackSize(direction, i);
+ const GridTrackSize& trackSize = gridTrackSize(direction, i, sizingData.sizingOperation);
if (trackSize.hasAutoMaxTrackBreadth())
autoSizedTracksIndex.append(i);
}
Modified: trunk/Source/WebCore/rendering/RenderGrid.h (202973 => 202974)
--- trunk/Source/WebCore/rendering/RenderGrid.h 2016-07-08 09:37:57 UTC (rev 202973)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2016-07-08 10:11:10 UTC (rev 202974)
@@ -74,6 +74,7 @@
class GridIterator;
class GridSizingData;
+ enum SizingOperation { TrackSizing, IntrinsicSizeComputation };
void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData&, LayoutUnit& baseSizesWithoutMaximization, LayoutUnit& growthLimitsWithoutMaximization);
LayoutUnit computeUsedBreadthOfMinLength(const GridLength&, LayoutUnit maxSize) const;
LayoutUnit computeUsedBreadthOfMaxLength(const GridLength&, LayoutUnit usedBreadth, LayoutUnit maxSize) const;
@@ -131,11 +132,11 @@
template <TrackSizeComputationPhase> void distributeSpaceToTracks(Vector<GridTrack*>&, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, LayoutUnit& availableLogicalSpace);
typedef HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> TrackIndexSet;
- double computeFlexFactorUnitSize(const Vector<GridTrack>&, GridTrackSizingDirection, double flexFactorSum, LayoutUnit leftOverSpace, const Vector<unsigned, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible = nullptr) const;
- double findFlexFactorUnitSize(const Vector<GridTrack>&, const GridSpan&, GridTrackSizingDirection, LayoutUnit spaceToFill) const;
+ double computeFlexFactorUnitSize(const Vector<GridTrack>&, GridTrackSizingDirection, SizingOperation, double flexFactorSum, LayoutUnit leftOverSpace, const Vector<unsigned, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible = nullptr) const;
+ double findFlexFactorUnitSize(const Vector<GridTrack>&, const GridSpan&, GridTrackSizingDirection, SizingOperation, LayoutUnit spaceToFill) const;
const GridTrackSize& rawGridTrackSize(GridTrackSizingDirection, unsigned) const;
- GridTrackSize gridTrackSize(GridTrackSizingDirection, unsigned) const;
+ GridTrackSize gridTrackSize(GridTrackSizingDirection, unsigned, SizingOperation) const;
bool updateOverrideContainingBlockContentLogicalWidthForChild(RenderBox&, GridSizingData&);
LayoutUnit logicalHeightForChild(RenderBox&, GridSizingData&);
@@ -173,12 +174,11 @@
bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingData&);
#endif
- bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection) const;
+ bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection, SizingOperation) const;
unsigned gridColumnCount() const;
unsigned gridRowCount() const;
- bool hasDefiniteLogicalSize(GridTrackSizingDirection) const;
LayoutUnit translateRTLCoordinate(LayoutUnit) const;
Vector<Vector<Vector<RenderBox*, 1>>> m_grid;