Index: LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js |
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js |
index ed962ebbba030f4572e94741a39fd60dadac1139..4f40595cb82e49a7e2bc1a5d435367577cb880ef 100755 |
--- a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js |
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js |
@@ -13,6 +13,10 @@ testGridDefinitionsValues(document.getElementById("gridWithMinMaxAndFixed"), "mi |
testGridDefinitionsValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(min-content, 30%) 15px", "120px minmax(35%, max-content)"); |
testGridDefinitionsValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr"); |
testGridDefinitionsValues(document.getElementById("gridWithFractionMinMax"), "minmax(min-content, 45px) 2fr", "3fr minmax(14px, max-content)"); |
+testGridDefinitionsValues(document.getElementById("gridWithCalcCalcElement"), "200px 100px", "150px 75px"); |
+testGridDefinitionsValues(document.getElementById("gridWithCalcAndFixedElement"), "50% 80px", "88px 25%"); |
+testGridDefinitionsValues(document.getElementById("gridWithCalcAndMinMaxElement"), "190px minmax(min-content, 80px)", "minmax(25%, max-content) 53px"); |
+testGridDefinitionsValues(document.getElementById("gridWithCalcInsideMinMaxElement"), "minmax(103px, 400px) 120px", "150px minmax(5%, 175px)"); |
debug(""); |
debug("Test the initial value"); |
@@ -30,6 +34,8 @@ testGridDefinitionsSetJSValues("auto 16em 22px", "56% 10em auto", "auto 160px 22 |
testGridDefinitionsSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px minmax(16px, 20px)"); |
testGridDefinitionsSetJSValues("16em 2fr", "14fr auto", "160px 2fr"); |
testGridDefinitionsSetJSValues("50% 12vw", "5% 85vh", "50% 96px", "5% 510px"); |
+testGridDefinitionsSetJSValues("calc(25px) calc(2em)", "auto calc(10%)", "25px 20px", "auto 10%"); |
+testGridDefinitionsSetJSValues("calc(25px + 40%) minmax(min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), max-content) auto", "345px minmax(min-content, 92px)", "minmax(100px, max-content) auto"); |
debug(""); |
debug("Test getting wrong values set from CSS"); |
@@ -54,6 +60,10 @@ testGridDefinitionsSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) |
testGridDefinitionsSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw"); |
testGridDefinitionsSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw"); |
+testGridDefinitionsSetBadJSValues("10px calc(16px 30px)", "calc(25px + auto) 2em"); |
+testGridDefinitionsSetBadJSValues("minmax(min-content, calc() 250px", "calc(2em("); |
+testGridDefinitionsSetBadJSValues("calc(2px = 2px) 3fr", "calc(2fr + 10%)"); |
+ |
function testInherit() |
{ |
var parentElement = document.createElement("div"); |