Index: LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
index 2f21f4dfc62ea0f56002f0f70c2cb4292e31c46c..199af8e1acb2378e0d74e471ba09935eaec1de28 100644 |
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
@@ -32,6 +32,14 @@ PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPrope |
PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-definition-rows') is "11px" |
PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-definition-columns') is "800px" |
PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-definition-rows') is "600px" |
+PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-definition-columns') is "150px" |
+PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-definition-rows') is "75px" |
+PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-definition-columns') is "550px" |
+PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-definition-rows') is "465px" |
+PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-definition-columns') is "80px" |
+PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-definition-rows') is "300px" |
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-definition-columns') is "415px" |
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-definition-rows') is "300px" |
Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none') |
PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-definition-columns') is "none" |
@@ -105,6 +113,24 @@ PASS element.style.gridDefinitionColumns is "3fr" |
PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "600px" |
PASS element.style.gridDefinitionRows is "4fr" |
+Test getting and setting grid-definition-columns and grid-definition-rows to calc() values through JS |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "150px" |
+PASS element.style.gridDefinitionColumns is "calc(150px)" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "75px" |
+PASS element.style.gridDefinitionRows is "calc(75px)" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "370px" |
+PASS element.style.gridDefinitionColumns is "calc(50% - 30px)" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "135px" |
+PASS element.style.gridDefinitionRows is "calc(75px + 10%)" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "200px" |
+PASS element.style.gridDefinitionColumns is "minmax(25%, calc(30px))" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "450px" |
+PASS element.style.gridDefinitionRows is "minmax(calc(75%), 40px)" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "110px" |
+PASS element.style.gridDefinitionColumns is "minmax(10%, calc(30px + 10%))" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "200px" |
+PASS element.style.gridDefinitionRows is "minmax(calc(25% - 50px), 200px)" |
+ |
Test setting grid-definition-columns and grid-definition-rows to bad values through JS |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none" |
@@ -128,6 +154,10 @@ PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-colu |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none" |
Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS |
PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px" |