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 f28e974bd653d93132930c2a80cba323118126ee..e5e25ef808c903843ef1d937aadd7b65afe6529d 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,28 +10,28 @@ |
width: 77px; |
} |
.gridWithFixed { |
- grid-definition-columns: "first" 10px; |
- grid-definition-rows: "first" 15px; |
+ grid-definition-columns: (first) 10px; |
+ grid-definition-rows: (first) 15px; |
} |
.gridWithPercent { |
- grid-definition-columns: 53% "last"; |
- grid-definition-rows: 27% "last"; |
+ grid-definition-columns: 53% (last); |
+ grid-definition-rows: 27% (last); |
} |
.gridWithAuto { |
- grid-definition-columns: "first" auto; |
- grid-definition-rows: auto "last"; |
+ grid-definition-columns: (first) auto; |
+ grid-definition-rows: auto (last); |
} |
.gridWithMinMax { |
- grid-definition-columns: "first" minmax(10%, 15px); |
- grid-definition-rows: minmax(20px, 50%) "last"; |
+ grid-definition-columns: (first) minmax(10%, 15px); |
+ grid-definition-rows: minmax(20px, 50%) (last); |
} |
.gridWithFixedMultiple { |
- grid-definition-columns: "first" "nav" 10px "last"; |
- grid-definition-rows: "first" "nav" 15px "last"; |
+ grid-definition-columns: (first nav) 10px (last); |
+ grid-definition-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-definition-columns: (first nav) 10% (nav) 15% (last); |
+ grid-definition-rows: (first nav2) 25% (nav2) 75% (last); |
} |
</style> |
<script src="../../resources/js-test.js"></script> |
@@ -61,18 +61,18 @@ |
debug(""); |
debug("Test getting and setting grid-definition-columns and grid-definition-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"); |
- testNonGridDefinitionsSetJSValues("'first' min-content", "min-content 'last'", "first min-content", "min-content last", "first min-content", "min-content last"); |
- testNonGridDefinitionsSetJSValues("'first' max-content", "max-content 'last'", "first max-content", "max-content last", "first max-content", "max-content last"); |
- testNonGridDefinitionsSetJSValues("'first' minmax(55%, 45px)", "minmax(30px, 40%) 'last'", "first minmax(55%, 45px)", "minmax(30px, 40%) last", "first minmax(55%, 45px)", "minmax(30px, 40%) last"); |
- testNonGridDefinitionsSetJSValues("'first' minmax(22em, max-content)", "minmax(max-content, 5em) 'last'", "first minmax(220px, max-content)", "minmax(max-content, 50px) last", "first minmax(22em, max-content)", "minmax(max-content, 5em) last", "first minmax(220px, max-content)", "minmax(max-content, 50px) last", "minmax(max-content, 50px) last"); |
- testNonGridDefinitionsSetJSValues("'first' minmax(22em, min-content)", "minmax(min-content, 5em) 'last'", "first minmax(220px, min-content)", "minmax(min-content, 50px) last", "first minmax(22em, min-content)", "minmax(min-content, 5em) last", "first minmax(220px, min-content)", "minmax(min-content, 50px) last", "minmax(min-content, 50px) last"); |
- testNonGridDefinitionsSetJSValues("'first' minmax(min-content, max-content)", "minmax(max-content, min-content) 'last'", "first minmax(min-content, max-content)", "minmax(max-content, min-content) last", "first minmax(min-content, max-content)", "minmax(max-content, min-content) last"); |
- testNonGridDefinitionsSetJSValues("'first' 'nav' minmax(min-content, max-content) 'last'", "'first' 'nav' minmax(max-content, min-content) 'last'", "first nav minmax(min-content, max-content) last", "first nav minmax(max-content, min-content) last", "first nav minmax(min-content, max-content) last", "first nav minmax(max-content, min-content) last"); |
- testNonGridDefinitionsSetJSValues("'first' 'nav' minmax(min-content, max-content) 'nav' auto 'last'", "'first' 'nav2' minmax(max-content, min-content) 'nav2' minmax(10px, 15px) 'last'", "first nav minmax(min-content, max-content) nav auto last", "first nav2 minmax(max-content, min-content) nav2 minmax(10px, 15px) last", "first nav minmax(min-content, max-content) nav auto last", "first nav2 minmax(max-content, min-content) nav2 minmax(10px, 15px) last");; |
- 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", "foo bar auto foo auto bar", "foo bar auto foo auto bar"); |
+ 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"); |
+ testNonGridDefinitionsSetJSValues("(first) min-content", "min-content (last)", "first min-content", "min-content last", "first min-content", "min-content last"); |
+ testNonGridDefinitionsSetJSValues("(first) max-content", "max-content (last)", "first max-content", "max-content last", "first max-content", "max-content last"); |
+ testNonGridDefinitionsSetJSValues("(first) minmax(55%, 45px)", "minmax(30px, 40%) (last)", "first minmax(55%, 45px)", "minmax(30px, 40%) last", "first minmax(55%, 45px)", "minmax(30px, 40%) last"); |
+ testNonGridDefinitionsSetJSValues("(first) minmax(22em, max-content)", "minmax(max-content, 5em) (last)", "first minmax(220px, max-content)", "minmax(max-content, 50px) last", "first minmax(22em, max-content)", "minmax(max-content, 5em) last", "first minmax(220px, max-content)", "minmax(max-content, 50px) last", "minmax(max-content, 50px) last"); |
+ testNonGridDefinitionsSetJSValues("(first) minmax(22em, min-content)", "minmax(min-content, 5em) (last)", "first minmax(220px, min-content)", "minmax(min-content, 50px) last", "first minmax(22em, min-content)", "minmax(min-content, 5em) last", "first minmax(220px, min-content)", "minmax(min-content, 50px) last", "minmax(min-content, 50px) last"); |
+ testNonGridDefinitionsSetJSValues("(first) minmax(min-content, max-content)", "minmax(max-content, min-content) (last)", "first minmax(min-content, max-content)", "minmax(max-content, min-content) last", "first minmax(min-content, max-content)", "minmax(max-content, min-content) last"); |
+ testNonGridDefinitionsSetJSValues("(first nav) minmax(min-content, max-content) (last)", "(first nav) minmax(max-content, min-content) (last)", "first nav minmax(min-content, max-content) last", "first nav minmax(max-content, min-content) last", "first nav minmax(min-content, max-content) last", "first nav minmax(max-content, min-content) last"); |
+ testNonGridDefinitionsSetJSValues("(first nav) minmax(min-content, max-content) (nav) auto (last)", "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)", "first nav minmax(min-content, max-content) nav auto last", "first nav2 minmax(max-content, min-content) nav2 minmax(10px, 15px) last", "first nav minmax(min-content, max-content) nav auto last", "first nav2 minmax(max-content, min-content) nav2 minmax(10px, 15px) last");; |
+ 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", "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"); |