Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html |
index f09780f154f43b21d8a5fb45b3f771704984d550..f1d58c64ceabccbf59bb6c346ed7d75cff266b06 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html |
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html |
@@ -24,18 +24,33 @@ |
#gridTemplateComplexFormWithLineNames { |
grid-template: [head] "a" 15px [tail] / 10px; |
} |
+#gridTemplateComplexFormWithLineNamesWithoutRowSize { |
+ grid-template: [head] "a" [tail] / 10px; |
+} |
#gridTemplateComplexFormWithLineNamesMultipleColumns { |
grid-template: [head] "a b" 15px [tail] / 10px; |
} |
+#gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize { |
+ grid-template: [head] "a b" [tail] / 10px; |
+} |
#gridTemplateComplexFormWithLineNamesMultipleRows { |
grid-template: [head1] "a" 15px [tail1] |
[head2] "b" 20px [tail2] / 10px; |
} |
+#gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes { |
+ grid-template: [head1] "a" [tail1] |
+ [head2] "b" [tail2] / 10px; |
+} |
#gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns { |
- grid-template: "a b c" 100px [nav] |
+ grid-template: "a b c" 100px [nav] |
[nav2] "d e f" 25px [nav] |
[nav2] "g h i" 25px [last] / [first] 10px repeat(2, [nav nav2] 15px); |
} |
+#gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes { |
+ grid-template: "a b c" [nav] |
+ [nav2] "d e f" [nav] |
+ [nav2] "g h i" [last] / [first] 10px repeat(2, [nav nav2] 15px); |
+} |
#gridTemplateComplexFormWithAuto { |
grid-template: "a" / 10px; |
} |
@@ -103,6 +118,13 @@ |
#gridTemplateComplexFormMisplacedRowsSize2 { |
grid-template: "a" [name] 10px / 25px; |
} |
+#gridTemplateComplexFormMisplacedRowsSize3 { |
+ grid-template: [head] "a" [tail] 10px / 10px; |
+} |
+#gridTemplateComplexFormMisplacedRowsSize4 { |
+ grid-template: [head1] "a" [tail1] |
+ [head2] "a" [tail2] 100px / 10px; |
+} |
#gridTemplateComplexFormColumnsNotParsing1 { |
grid-template: "a" [name] 10px / a; |
} |
@@ -119,6 +141,7 @@ |
grid-template: [first] "a" auto [] [tail]; |
} |
+ |
</style> |
<script src="../../resources/js-test.js"></script> |
</head> |
@@ -130,9 +153,13 @@ |
<div class="grid" id="gridTemplateSimpleFormWithNone"></div> |
<div class="grid" id="gridTemplateComplexForm"></div> |
<div class="grid" id="gridTemplateComplexFormWithLineNames"></div> |
+<div class="grid" id="gridTemplateComplexFormWithLineNamesWithoutRowSize"></div> |
<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleColumns"></div> |
+<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize"></div> |
<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRows"></div> |
+<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes"></div> |
<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns"></div> |
+<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes"></div> |
<div class="grid" id="gridTemplateComplexFormWithAuto"></div> |
<div class="grid" id="gridTemplateComplexFormOnlyAreas"></div> |
<div class="grid" id="gridTemplateNoColumnsRowWithEmptyTrailingLineNames"></div> |
@@ -155,6 +182,8 @@ |
<div class="grid" id="gridTemplateComplexFormNoColumnSize"></div> |
<div class="grid" id="gridTemplateComplexFormMisplacedRowsSize1"></div> |
<div class="grid" id="gridTemplateComplexFormMisplacedRowsSize2"></div> |
+<div class="grid" id="gridTemplateComplexFormMisplacedRowsSize3"></div> |
+<div class="grid" id="gridTemplateComplexFormMisplacedRowsSize4"></div> |
<div class="grid" id="gridTemplateComplexFormColumnsNotParsing1"></div> |
<div class="grid" id="gridTemplateComplexFormColumnsNotParsing2"></div> |
<div class="grid" id="gridTemplateComplexFormWithNoneColumns"></div> |
@@ -172,9 +201,13 @@ |
testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWithNone"), "none", "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexForm"), "10px", "15px", '"a"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNames"), "10px", "[head] 15px [tail]", '"a"'); |
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesWithoutRowSize"), "10px", "[head] 0px [tail]", '"a"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleColumns"), "10px", "[head] 15px [tail]", '"a b"'); |
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize"), "10px", "[head] 0px [tail]", '"a b"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRows"), "10px", "[head1] 15px [tail1 head2] 20px [tail2]", '"a" "b"'); |
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes"), "10px", "[head1] 0px [tail1 head2] 0px [tail2]", '"a" "b"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns"), "[first] 10px [nav nav2] 15px [nav nav2] 15px", "100px [nav nav2] 25px [nav nav2] 25px [last]", '"a b c" "d e f" "g h i"'); |
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes"), "[first] 10px [nav nav2] 15px [nav nav2] 15px", "0px [nav nav2] 0px [nav nav2] 0px [last]", '"a b c" "d e f" "g h i"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithAuto"), "10px", "0px", '"a"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormOnlyAreas"), "none", "0px", '"a"'); |
testGridDefinitionsValues(document.getElementById("gridTemplateNoColumnsRowWithEmptyTrailingLineNames"), "none", "[first] 0px", '"a"'); |
@@ -199,6 +232,8 @@ |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormNoColumnSize"), "none", "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize1"), "none", "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize2"), "none", "none", "none"); |
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize3"), "none", "none", "none"); |
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize4"), "none", "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormColumnsNotParsing1"), "none", "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormColumnsNotParsing2"), "none", "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithNoneColumns"), "none", "none", "none"); |