Index: LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt |
diff --git a/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt |
index 08c7248e3dd561a8d3b1520d4ca59fa089e71158..8142a1431b0e3af3f6159bd2e62d779adebe21fe 100644 |
--- a/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt |
+++ b/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt |
@@ -7,27 +7,51 @@ Test getting the longhand values when shorthand is set through CSS. |
PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-flow') is "row" |
PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('grid-auto-rows') is "auto" |
PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-template-columns') is "15px" |
PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-template-rows') is "10px" |
PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-flow') is "row" |
PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('grid-auto-rows') is "auto" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-auto-flow') is "row" |
+PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-auto-flow') is "column" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-auto-columns') is "10px" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('grid-auto-rows') is "10px" |
PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-flow') is "none" |
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-columns') is "10px" |
-PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-rows') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-flow') is "row" |
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-columns') is "auto" |
+PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('grid-auto-rows') is "auto" |
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-template-columns') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-template-rows') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-template-areas') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-auto-flow') is "column dense" |
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-auto-columns') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('grid-auto-rows') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-template-columns') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-template-rows') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-template-areas') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-auto-flow') is "row dense" |
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-auto-columns') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('grid-auto-rows') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('grid-template-columns') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('grid-template-rows') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('grid-template-areas') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('grid-auto-flow') is "stack column" |
+PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('grid-auto-columns') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('grid-auto-rows') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('grid-template-columns') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('grid-template-rows') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('grid-template-areas') is "none" |
+PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('grid-auto-flow') is "stack row" |
+PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('grid-auto-columns') is "10px" |
+PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('grid-auto-rows') is "10px" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('grid-template-areas') is "none" |
@@ -39,21 +63,33 @@ Test getting wrong values for 'grid' shorthand through CSS (they should resolve |
PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-flow') is "row" |
PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS window.getComputedStyle(gridWithExplicitAndImplicit, '').getPropertyValue('grid-auto-rows') is "auto" |
PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-flow') is "row" |
PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS window.getComputedStyle(gridWithMisplacedNone1, '').getPropertyValue('grid-auto-rows') is "auto" |
PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-flow') is "row" |
PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS window.getComputedStyle(gridWithMisplacedNone2, '').getPropertyValue('grid-auto-rows') is "auto" |
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-template-columns') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-template-rows') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-template-areas') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-auto-flow') is "row" |
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-auto-columns') is "auto" |
+PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('grid-auto-rows') is "auto" |
+PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('grid-template-columns') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('grid-template-rows') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('grid-template-areas') is "none" |
+PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('grid-auto-flow') is "row" |
+PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('grid-auto-columns') is "auto" |
+PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('grid-auto-rows') is "auto" |
Test getting and setting 'grid' shorthand through JS |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "10px" |
@@ -62,7 +98,7 @@ PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20 |
PASS element.style.gridTemplateRows is "20px" |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none" |
PASS element.style.gridTemplateAreas is "none" |
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row" |
PASS element.style.gridAutoFlow is "initial" |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS element.style.gridAutoColumns is "initial" |
@@ -74,7 +110,7 @@ PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(l |
PASS element.style.gridTemplateRows is "(line) 20px" |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "\"a\"" |
PASS element.style.gridTemplateAreas is "\"a\"" |
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row" |
PASS element.style.gridAutoFlow is "initial" |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS element.style.gridAutoColumns is "initial" |
@@ -86,8 +122,8 @@ PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "no |
PASS element.style.gridTemplateRows is "initial" |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none" |
PASS element.style.gridTemplateAreas is "initial" |
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row" |
-PASS element.style.gridAutoFlow is "row" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row dense" |
+PASS element.style.gridAutoFlow is "row dense" |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "20px" |
PASS element.style.gridAutoColumns is "20px" |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "20px" |
@@ -109,13 +145,13 @@ Test the initial value |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none" |
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS window.getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "auto" |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none' |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none' |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is 'none' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'none' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is 'row' |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is 'auto' |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is 'auto' |
@@ -138,7 +174,7 @@ PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "no |
PASS element.style.gridTemplateRows is "none" |
PASS getComputedStyle(element, '').getPropertyValue('grid-template-areas') is "none" |
PASS element.style.gridTemplateAreas is "none" |
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "none" |
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-flow') is "row" |
PASS element.style.gridAutoFlow is "initial" |
PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "auto" |
PASS element.style.gridAutoColumns is "initial" |