| Index: LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
|
| diff --git a/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html b/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
|
| index 2373bd814e965297e2651350e46acc06765d8376..7e23dfaf919f4ad5949eb55dec51b0b885de549e 100644
|
| --- a/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
|
| +++ b/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
|
| @@ -4,48 +4,48 @@
|
| <link href="resources/grid.css" rel="stylesheet">
|
| <style>
|
| .singleSingleTrackRepeat {
|
| - grid-definition-rows: repeat(1, 18px);
|
| - grid-definition-columns: repeat(1, 15%);
|
| + grid-template-rows: repeat(1, 18px);
|
| + grid-template-columns: repeat(1, 15%);
|
| }
|
|
|
| .twoSingleTrackRepeat {
|
| - grid-definition-rows: repeat(2, auto);
|
| - grid-definition-columns: repeat(2, minmax(15px, 50%));
|
| + grid-template-rows: repeat(2, auto);
|
| + grid-template-columns: repeat(2, minmax(15px, 50%));
|
| }
|
|
|
| .twoDoubleTrackRepeat {
|
| - grid-definition-rows: repeat(2, minmax(5px, 10px) auto);
|
| - grid-definition-columns: repeat(2, auto minmax(100px, 120px));
|
| + grid-template-rows: repeat(2, minmax(5px, 10px) auto);
|
| + grid-template-columns: repeat(2, auto minmax(100px, 120px));
|
| }
|
|
|
| .twoDoubleTrackWithNamedGridLineRepeat {
|
| - grid-definition-rows: repeat(2, 10px (start) auto (end));
|
| - grid-definition-columns: repeat(2, auto (middle) 250px (end));
|
| + grid-template-rows: repeat(2, 10px (start) auto (end));
|
| + grid-template-columns: repeat(2, auto (middle) 250px (end));
|
| }
|
|
|
| .twoDoubleTrackWithTrailingNamedGridLineRepeat {
|
| - grid-definition-rows: repeat(2, (before) 10px);
|
| - grid-definition-columns: repeat(2, (before) auto);
|
| + grid-template-rows: repeat(2, (before) 10px);
|
| + grid-template-columns: repeat(2, (before) auto);
|
| }
|
|
|
| .trailingNamedGridLineRepeat {
|
| - grid-definition-rows: repeat(1, 10px) (end);
|
| - grid-definition-columns: repeat(1, 250px) (end);
|
| + grid-template-rows: repeat(1, 10px) (end);
|
| + grid-template-columns: repeat(1, 250px) (end);
|
| }
|
|
|
| .leadingNamedGridLineRepeat {
|
| - grid-definition-rows: (start) repeat(2, 10px);
|
| - grid-definition-columns: (start) repeat(2, 250px);
|
| + grid-template-rows: (start) repeat(2, 10px);
|
| + grid-template-columns: (start) repeat(2, 250px);
|
| }
|
|
|
| .mixRepeatAfterNonRepeat {
|
| - grid-definition-rows: auto repeat(2, 10px);
|
| - grid-definition-columns: (start) 140px repeat(2, 250px);
|
| + grid-template-rows: auto repeat(2, 10px);
|
| + grid-template-columns: (start) 140px repeat(2, 250px);
|
| }
|
|
|
| .mixNonRepeatAfterRepeat {
|
| - grid-definition-rows: repeat(2, 10px) (end) auto;
|
| - grid-definition-columns: repeat(2, 250px) 15% (last);
|
| + grid-template-rows: repeat(2, 10px) (end) auto;
|
| + grid-template-columns: repeat(2, 250px) 15% (last);
|
| }
|
| </style>
|
| <script src="../../resources/js-test.js"></script>
|
| @@ -63,9 +63,9 @@
|
|
|
| <script src="resources/grid-definitions-parsing-utils.js"></script>
|
| <script>
|
| - description('Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected');
|
| + description('Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected');
|
|
|
| - debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
|
| + debug("Test getting grid-template-columns and grid-template-rows set through CSS");
|
| testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeat"), "15%", "18px");
|
| testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "minmax(15px, 50%) minmax(15px, 50%)", "auto auto");
|
| testGridDefinitionsValues(document.getElementById("twoDoubleTrackRepeat"), "auto minmax(100px, 120px) auto minmax(100px, 120px)", "minmax(5px, 10px) auto minmax(5px, 10px) auto");
|
| @@ -81,8 +81,8 @@
|
| function testInvalidSyntax(gridColumn) {
|
| element = document.createElement("div");
|
| document.body.appendChild(element);
|
| - element.style.gridDefinitionColumns = gridColumn;
|
| - shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "none");
|
| + element.style.gridTemplateColumns = gridColumn;
|
| + shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
|
| document.body.removeChild(element);
|
| }
|
| testInvalidSyntax("repeat(");
|
|
|