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 4b23c449bfbf3b83c1973bf5dcea3a3fea6911a6..aec0b8dcc3827764bd77fba12c9a305146c293dd 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 |
@@ -24,6 +24,14 @@ PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-colu |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "max-content" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "1fr" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "2fr" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "150px" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "75px" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "550px" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "465px" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(10%, 15px)" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(20px, 50%)" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(10%, 415px)" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(80px, 50%)" |
Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none') |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none" |
@@ -97,6 +105,24 @@ PASS element.style.gridDefinitionColumns is "3fr" |
PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "4fr" |
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 "minmax(25%, 30px)" |
+PASS element.style.gridDefinitionColumns is "minmax(25%, calc(30px))" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(75%, 40px)" |
+PASS element.style.gridDefinitionRows is "minmax(calc(75%), 40px)" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(10%, 110px)" |
+PASS element.style.gridDefinitionColumns is "minmax(10%, calc(30px + 10%))" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(100px, 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" |
@@ -120,6 +146,12 @@ 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" |
+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" |