| Index: LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
|
| diff --git a/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html b/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
|
| index adba071d1c212f4e16bcdaed7a2fbbe597d82a27..c9aa5c2ff40936ba4fe2ed1889ba23b31e622a26 100644
|
| --- a/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
|
| +++ b/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
|
| @@ -10,36 +10,36 @@
|
| width: 77px;
|
| }
|
| .gridWithFixed {
|
| - grid-definition-columns: (first) 10px;
|
| - grid-definition-rows: (first) 15px;
|
| + grid-template-columns: (first) 10px;
|
| + grid-template-rows: (first) 15px;
|
| }
|
| .gridWithPercent {
|
| - grid-definition-columns: 53% (last);
|
| - grid-definition-rows: 27% (last);
|
| + grid-template-columns: 53% (last);
|
| + grid-template-rows: 27% (last);
|
| }
|
| .gridWithAuto {
|
| - grid-definition-columns: (first) auto;
|
| - grid-definition-rows: auto (last);
|
| + grid-template-columns: (first) auto;
|
| + grid-template-rows: auto (last);
|
| }
|
| .gridWithMinMax {
|
| - grid-definition-columns: (first) minmax(10%, 15px);
|
| - grid-definition-rows: minmax(20px, 50%) (last);
|
| + grid-template-columns: (first) minmax(10%, 15px);
|
| + grid-template-rows: minmax(20px, 50%) (last);
|
| }
|
| .gridWithFixedMultiple {
|
| - grid-definition-columns: (first nav) 10px (last);
|
| - grid-definition-rows: (first nav) 15px (last);
|
| + grid-template-columns: (first nav) 10px (last);
|
| + grid-template-rows: (first nav) 15px (last);
|
| }
|
| .gridWithPercentageSameStringMultipleTimes {
|
| - grid-definition-columns: (first nav) 10% (nav) 15% (last);
|
| - grid-definition-rows: (first nav2) 25% (nav2) 75% (last);
|
| + grid-template-columns: (first nav) 10% (nav) 15% (last);
|
| + grid-template-rows: (first nav2) 25% (nav2) 75% (last);
|
| }
|
| .gridWithRepeat {
|
| - grid-definition-columns: (first) 10px repeat(2, (nav nav2) 50%);
|
| - grid-definition-rows: 100px repeat(2, (nav nav2) 25%) (last);
|
| + grid-template-columns: (first) 10px repeat(2, (nav nav2) 50%);
|
| + grid-template-rows: 100px repeat(2, (nav nav2) 25%) (last);
|
| }
|
| .gridWithEmptyParentheses {
|
| - grid-definition-columns: () 10px;
|
| - grid-definition-rows: 20px ( ) 50px ();
|
| + grid-template-columns: () 10px;
|
| + grid-template-rows: 20px ( ) 50px ();
|
| }
|
| </style>
|
| <script src="../../resources/js-test.js"></script>
|
| @@ -59,9 +59,9 @@
|
|
|
| <script src="resources/grid-definitions-parsing-utils.js"></script>
|
| <script>
|
| - description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
|
| + description('Test that setting and getting grid-template-columns and grid-template-rows 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("gridWithFixedElement"), "(first) 10px", "(first) 15px");
|
| testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53% (last)", "27% (last)");
|
| testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "(first) auto", "auto (last)");
|
| @@ -72,7 +72,7 @@
|
| testGridDefinitionsValues(document.getElementById("gridWithEmptyParentheses"), "10px", "20px 50px");
|
|
|
| debug("");
|
| - debug("Test getting and setting grid-definition-columns and grid-definition-rows through JS");
|
| + debug("Test getting and setting grid-template-columns and grid-template-rows through JS");
|
| testNonGridDefinitionsSetJSValues("(first) 18px", "66px (last)", "(first) 18px", "66px (last)", "(first) 18px", "66px (last)");
|
| testNonGridDefinitionsSetJSValues("(first) 55%", "40% (last)", "(first) 55%", "40% (last)", "(first) 55%", "40% (last)");
|
| testNonGridDefinitionsSetJSValues("(first) auto", "auto (last)", "(first) auto", "auto (last)", "(first) auto", "auto (last)");
|
| @@ -87,20 +87,20 @@
|
| testNonGridDefinitionsSetJSValues("(foo bar) auto (foo) auto (bar)", "(foo bar) auto (foo) auto (bar)", "(foo bar) auto (foo) auto (bar)", "(foo bar) auto (foo) auto (bar)");
|
|
|
| debug("");
|
| - debug("Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS");
|
| + debug("Test getting and setting invalid grid-template-columns and grid-template-rows through JS");
|
| element = document.createElement("div");
|
| document.body.appendChild(element);
|
| - element.style.gridDefinitionColumns = "'foo'";
|
| - element.style.gridDefinitionRows = "'bar";
|
| - shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "none");
|
| - shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "none");
|
| + element.style.gridTemplateColumns = "'foo'";
|
| + element.style.gridTemplateRows = "'bar";
|
| + shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
|
| + shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "none");
|
|
|
| element = document.createElement("div");
|
| document.body.appendChild(element);
|
| - element.style.gridDefinitionColumns = "'foo' 'bar'";
|
| - element.style.gridDefinitionRows = "'bar' 'foo'";
|
| - shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "none");
|
| - shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "none");
|
| + element.style.gridTemplateColumns = "'foo' 'bar'";
|
| + element.style.gridTemplateRows = "'bar' 'foo'";
|
| + shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
|
| + shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "none");
|
| </script>
|
| </body>
|
| </html>
|
|
|