Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html |
index 6491c20c08c5d2483dba79e36afc54aa3dd8ed13..ba33311f3e152f216740ba6e2fa8febc840baa4b 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html |
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html |
@@ -37,6 +37,12 @@ |
grid-auto-columns: 25px 50px 100px; |
} |
+.gridAutoFitContent { |
+ height: 50px; |
+ grid-auto-columns: fit-content(30px); |
+ grid-auto-rows: fit-content(50%); |
+} |
+ |
</style> |
<script src="../../resources/js-test.js"></script> |
<script src="resources/grid-definitions-parsing-utils.js"></script> |
@@ -65,6 +71,7 @@ |
<div style="grid-column: -4; grid-row: -4"></div> |
<div style="grid-column: -5; grid-row: -5"></div> |
</div> |
+<div class="grid gridAutoFitContent" id="gridAutoFitContent"></div> |
<script> |
description('Test that setting and getting grid-auto-columns and grid-auto-rows works as expected'); |
@@ -74,6 +81,7 @@ testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixed"), "30 |
testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMax"), "minmax(10%, 15px)", "minmax(30%, 100px)"); |
testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "min-content", "max-content"); |
testGridAutoDefinitionsValues(document.getElementById("gridAutoAutoInMinMax"), "minmax(auto, 48px)", "minmax(80px, auto)"); |
+testGridAutoDefinitionsValues(document.getElementById("gridAutoFitContent"), "fit-content(50%)", "fit-content(30px)"); |
debug(""); |
debug("Test that getting grid-template-columns and grid-template-rows set through CSS lists every track listed whether implicitly or explicitly created"); |
@@ -113,6 +121,7 @@ testAutoValues("18em", "66em", "180px", "660px"); |
testAutoValues("minmax(min-content, 8vh)", "minmax(10vw, min-content)", "minmax(min-content, 48px)", "minmax(80px, min-content)"); |
testAutoValues("minmax(min-content, max-content)", "minmax(max-content, min-content)"); |
testAutoValues("minmax(min-content, 10px) 48px 5%", "auto 30px minmax(10%, 60%)"); |
+testAutoValues("fit-content(10px) fit-content(30%)", "fit-content(5%) fit-content(calc(20px + 2em))", "fit-content(10px) fit-content(30%)", "fit-content(5%) fit-content(40px)"); |
debug(""); |
debug("Test setting grid-auto-columns and grid-auto-rows to bad minmax value through JS"); |
@@ -122,6 +131,7 @@ testAutoValues("minmax()", "minmax(30px 30% 30em)", "auto", "auto"); |
testAutoValues("none", "none", "auto", "auto"); |
testAutoValues("10px [a] 20px", "[z] auto [y] min-content", "auto", "auto"); |
testAutoValues("repeat(2, 10px [a] 20px)", "[z] repeat(auto-fit, 100px)", "auto", "auto"); |
+testAutoValues("fit-content(min-content) fit-content(auto)", "fit-content(fit-content(3%)) fit-content(minmax(2px, 30px))", "auto", "auto"); |
function testInherit() |
{ |