[CSS Grid Layout] Implementation of the grid-template shorthand.

LayoutTests/fast/css-grid-layout/grid-template-shorthand-columns-rows-get-set.html

Index: LayoutTests/fast/css-grid-layout/grid-template-shorthand-columns-rows-get-set.html
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-columns-rows-get-set.html
similarity index 67%
copy from LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
copy to LayoutTests/fast/css-grid-layout/grid-template-shorthand-columns-rows-get-set.html
index c9611426e9817b87e0925569d5f3750e37abf315..ae6b64be76f293d6aa794657765b4ee80e301b42 100644
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-template-shorthand-columns-rows-get-set.html
@@ -21,69 +21,53 @@
     height: 3px;
 }
 .gridWithNone {
-    grid-template-columns: none;
-    grid-template-rows: none;
+    grid-template: none / none;
 }
 .gridWithFixed {
-    grid-template-columns: 10px;
-    grid-template-rows: 15px;
+    grid-template: 10px / 15px;
 }
 .gridWithPercent {
-    grid-template-columns: 50%;
-    grid-template-rows: 25%;
+    grid-template: 50% / 25%;
 }
 .gridWithAuto {
-    grid-template-columns: auto;
-    grid-template-rows: auto;
+    grid-template: auto / auto;
 }
 .gridWithEM {
-    grid-template-columns: 10em;
-    grid-template-rows: 15em;
+    grid-template: 10em / 15em;
     font: 10px Ahem;
 }
 .gridWithViewPortPercentage {
-    grid-template-columns: 8vw;
-    grid-template-rows: 10vh;
+    grid-template: 8vw / 10vh;
 }
 .gridWithFitContent {
-    grid-template-columns: -webkit-fit-content;
-    grid-template-rows: -webkit-fit-content;
+    grid-template: -webkit-fit-content / -webkit-fit-content;
 }
 .gridWithFitAvailable {
-    grid-template-columns: -webkit-fit-available;
-    grid-template-rows: -webkit-fit-available;
+    grid-template: -webkit-fit-available / -webkit-fit-available;
 }
 .gridWithMinMax {
-    grid-template-columns: minmax(10%, 15px);
-    grid-template-rows: minmax(20px, 50%);
+    grid-template: minmax(10%, 15px) / minmax(20px, 50%);
 }
 .gridWithMinContent {
-    grid-template-columns: min-content;
-    grid-template-rows: min-content;
+    grid-template: min-content / min-content;
 }
 .gridWithMaxContent {
-    grid-template-columns: max-content;
-    grid-template-rows: max-content;
+    grid-template: max-content / max-content;
 }
 .gridWithFraction {
-    grid-template-columns: 1fr;
-    grid-template-rows: 2fr;
+    grid-template: 1fr / 2fr;
 }
 .gridWithCalc {
-    grid-template-columns: calc(150px);
-    grid-template-rows: calc(75px);
+    grid-template: calc(150px) / calc(75px);
 }
 .gridWithCalcComplex {
-    grid-template-columns: calc(50% + 150px);
-    grid-template-rows: calc(65% + 75px);
+    grid-template: calc(50% + 150px) / calc(65% + 75px);
 }
 .gridWithCalcInsideMinMax {
-    grid-template-columns: minmax(10%, calc(15px));
-    grid-template-rows: minmax(calc(20px), 50%);
+    grid-template: minmax(10%, calc(15px)) / minmax(calc(20px), 50%);
 }
 .gridWithCalcComplexInsideMinMax {
-    grid-template-columns: minmax(10%, calc(50% + 15px));
-    grid-template-rows: minmax(calc(20px + 10%), 50%);
+    grid-template: minmax(10%, calc(50% + 15px)) / minmax(calc(20px + 10%), 50%);
 }
 </style>
 <script src="../../resources/js-test.js"></script>
@@ -121,7 +105,7 @@
 <div class="grid gridWithCalcComplex" id="gridWithCalcComplexElement"></div>
 <div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div>
 <div class="grid gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMaxElement"></div>
-<script src="resources/grid-definitions-parsing-utils.js"></script>
-<script src="resources/grid-columns-rows-get-set.js"></script>
+<script src="resources/grid-template-shorthand-parsing-utils.js"></script>
+<script src="resources/grid-template-shorthand-columns-rows-get-set.js"></script>
 </body>
 </html>