[CSS Grid Layout] Rename grid-definition-{columns|rows} to match the …

…new syntax

https://bugs.webkit.org/show_bug.cgi?id=127989

Patch by Javier Fernandez <jfernandez@igalia.com> on 2014-02-07
Reviewed by Andreas Kling.

In the latest WD, grid-definition-{columns|rows} were renamed to grid-template-{columns|rows}.

Source/WebCore:

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):

LayoutTests:

* fast/css-grid-layout/auto-content-resolution-columns.html:
* fast/css-grid-layout/auto-content-resolution-rows.html:
* fast/css-grid-layout/breadth-size-resolution-grid.html:
* fast/css-grid-layout/calc-resolution-grid-item.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
* fast/css-grid-layout/flex-content-resolution-columns.html:
* fast/css-grid-layout/flex-content-resolution-rows.html:
* fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-update.html:
* fast/css-grid-layout/grid-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-flow-update.html:
* fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-dynamic-updates-relayout.html:
* fast/css-grid-layout/grid-element-border-grid-item.html:
* fast/css-grid-layout/grid-element-border-padding-grid-item.html:
* fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt:
* fast/css-grid-layout/grid-element-change-columns-repaint.html:
* fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt:
* fast/css-grid-layout/grid-element-change-rows-repaint.html:
* fast/css-grid-layout/grid-element-empty-row-column.html:
* fast/css-grid-layout/grid-element-min-max-width.html:
* fast/css-grid-layout/grid-element-padding-grid-item.html:
* fast/css-grid-layout/grid-element-padding-margin.html:
* fast/css-grid-layout/grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
* fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
* fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
* fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
* fast/css-grid-layout/grid-item-change-column-repaint.html:
* fast/css-grid-layout/grid-item-change-row-repaint.html:
* fast/css-grid-layout/grid-item-margin-resolution.html:
* fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
* fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
* fast/css-grid-layout/grid-item-negative-position-resolution.html:
* fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
* fast/css-grid-layout/grid-item-order-paint-order.html:
* fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
* fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
* fast/css-grid-layout/grid-item-spanning-resolution.html:
* fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
* fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
* fast/css-grid-layout/grid-preferred-logical-widths.html:
* fast/css-grid-layout/implicit-columns-auto-resolution.html:
* fast/css-grid-layout/implicit-position-dynamic-change.html:
* fast/css-grid-layout/implicit-rows-auto-resolution.html:
* fast/css-grid-layout/minmax-fixed-logical-height-only.html:
* fast/css-grid-layout/minmax-fixed-logical-width-only.html:
* fast/css-grid-layout/minmax-max-content-resolution-columns.html:
* fast/css-grid-layout/minmax-max-content-resolution-rows.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
* fast/css-grid-layout/minmax-spanning-resolution-columns.html:
* fast/css-grid-layout/minmax-spanning-resolution-rows.html:
* fast/css-grid-layout/named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set.html:
* fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/non-grid-element-repeat-get-set.html:
* fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/non-named-grid-line-get-set.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
* fast/css-grid-layout/percent-resolution-grid-item.html:
* fast/css-grid-layout/place-cell-by-index.html:
* fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
(testGridTemplatesValues):
(testGridTemplatesSetJSValues):
(testNonGridTemplatesSetJSValues):
(checkGridTemplatesSetJSValues):
(testGridTemplatesSetBadJSValues):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* ietestcenter/css3/grid/display-grid-001-expected.htm:

Canonical link: https://commits.webkit.org/146397@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,110 @@
+2014-02-07  Javier Fernandez  <jfernandez@igalia.com>
+
+        [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax
+        https://bugs.webkit.org/show_bug.cgi?id=127989
+
+        Reviewed by Andreas Kling.
+
+        In the latest WD, grid-definition-{columns|rows} were renamed to grid-template-{columns|rows}.
+
+        * fast/css-grid-layout/auto-content-resolution-columns.html:
+        * fast/css-grid-layout/auto-content-resolution-rows.html:
+        * fast/css-grid-layout/breadth-size-resolution-grid.html:
+        * fast/css-grid-layout/calc-resolution-grid-item.html:
+        * fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
+        * fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
+        * fast/css-grid-layout/flex-content-resolution-columns.html:
+        * fast/css-grid-layout/flex-content-resolution-rows.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-update.html:
+        * fast/css-grid-layout/grid-auto-flow-resolution.html:
+        * fast/css-grid-layout/grid-auto-flow-update.html:
+        * fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
+        * fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
+        * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
+        * fast/css-grid-layout/grid-columns-rows-get-set.html:
+        * fast/css-grid-layout/grid-dynamic-updates-relayout.html:
+        * fast/css-grid-layout/grid-element-border-grid-item.html:
+        * fast/css-grid-layout/grid-element-border-padding-grid-item.html:
+        * fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt:
+        * fast/css-grid-layout/grid-element-change-columns-repaint.html:
+        * fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt:
+        * fast/css-grid-layout/grid-element-change-rows-repaint.html:
+        * fast/css-grid-layout/grid-element-empty-row-column.html:
+        * fast/css-grid-layout/grid-element-min-max-width.html:
+        * fast/css-grid-layout/grid-element-padding-grid-item.html:
+        * fast/css-grid-layout/grid-element-padding-margin.html:
+        * fast/css-grid-layout/grid-element-repeat-get-set-expected.txt:
+        * fast/css-grid-layout/grid-element-repeat-get-set.html:
+        * fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
+        * fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
+        * fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
+        * fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
+        * fast/css-grid-layout/grid-item-change-column-repaint.html:
+        * fast/css-grid-layout/grid-item-change-row-repaint.html:
+        * fast/css-grid-layout/grid-item-margin-resolution.html:
+        * fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
+        * fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
+        * fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
+        * fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
+        * fast/css-grid-layout/grid-item-negative-position-resolution.html:
+        * fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
+        * fast/css-grid-layout/grid-item-order-paint-order.html:
+        * fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
+        * fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
+        * fast/css-grid-layout/grid-item-spanning-resolution.html:
+        * fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
+        * fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
+        * fast/css-grid-layout/grid-preferred-logical-widths.html:
+        * fast/css-grid-layout/implicit-columns-auto-resolution.html:
+        * fast/css-grid-layout/implicit-position-dynamic-change.html:
+        * fast/css-grid-layout/implicit-rows-auto-resolution.html:
+        * fast/css-grid-layout/minmax-fixed-logical-height-only.html:
+        * fast/css-grid-layout/minmax-fixed-logical-width-only.html:
+        * fast/css-grid-layout/minmax-max-content-resolution-columns.html:
+        * fast/css-grid-layout/minmax-max-content-resolution-rows.html:
+        * fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
+        * fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
+        * fast/css-grid-layout/minmax-spanning-resolution-columns.html:
+        * fast/css-grid-layout/minmax-spanning-resolution-rows.html:
+        * fast/css-grid-layout/named-grid-line-get-set-expected.txt:
+        * fast/css-grid-layout/named-grid-line-get-set.html:
+        * fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
+        * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
+        * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
+        * fast/css-grid-layout/non-grid-columns-rows-get-set.html:
+        * fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt:
+        * fast/css-grid-layout/non-grid-element-repeat-get-set.html:
+        * fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
+        * fast/css-grid-layout/non-named-grid-line-get-set.html:
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
+        * fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
+        * fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
+        * fast/css-grid-layout/percent-resolution-grid-item.html:
+        * fast/css-grid-layout/place-cell-by-index.html:
+        * fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
+        (testInherit):
+        (testInitial):
+        * fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
+        (testInherit):
+        (testInitial):
+        * fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
+        (testGridTemplatesValues):
+        (testGridTemplatesSetJSValues):
+        (testNonGridTemplatesSetJSValues):
+        (checkGridTemplatesSetJSValues):
+        (testGridTemplatesSetBadJSValues):
+        * fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
+        (testInherit):
+        (testInitial):
+        * fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
+        (testInherit):
+        (testInitial):
+        * ietestcenter/css3/grid/display-grid-001-expected.htm:
+
 2014-02-07  Dean Jackson  <dino@apple.com>
 
         animations/suspend-resume-animation.html is flakey

LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html

@@ -7,8 +7,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    -webkit-grid-definition-columns: auto;
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: auto;
+    -webkit-grid-template-rows: 50px;
 }
 
 .firstRowFirstColumn {

LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html

@@ -7,8 +7,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: auto;
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: auto;
 }
 
 .firstRowFirstColumn {

LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html

@@ -7,8 +7,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    -webkit-grid-definition-columns: 100px 10vw;
-    -webkit-grid-definition-rows: 10vh 100px;
+    -webkit-grid-template-columns: 100px 10vw;
+    -webkit-grid-template-rows: 10vh 100px;
 }
 
 .firstRowFirstColumn {

LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html

@@ -7,8 +7,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    -webkit-grid-definition-columns: 100px 300px;
-    -webkit-grid-definition-rows: 50px 150px;
+    -webkit-grid-template-columns: 100px 300px;
+    -webkit-grid-template-rows: 50px 150px;
     height: 200px;
     width: 400px;
 }

LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html

@@ -7,28 +7,28 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMaxMaxContent {
-    -webkit-grid-definition-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
+    -webkit-grid-template-rows: 50px;
 }
 
 .gridMinMinContent {
-    -webkit-grid-definition-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
+    -webkit-grid-template-rows: 50px;
 }
 
 .gridWithIntrinsicSizeBiggerThanFlex {
-    -webkit-grid-definition-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
+    -webkit-grid-template-rows: 50px;
 }
 
 .gridShrinkBelowItemsIntrinsicSize {
-    -webkit-grid-definition-columns: minmax(0px, 1fr) minmax(0px, 2fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(0px, 1fr) minmax(0px, 2fr);
+    -webkit-grid-template-rows: 50px;
 }
 
 .gridWithNonFlexingItems {
-    -webkit-grid-definition-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
+    -webkit-grid-template-rows: 50px;
 }
 
 .firstRowThirdColumn {

LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html

@@ -7,28 +7,28 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMaxMaxContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
 }
 
 .gridMinMinContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
 }
 
 .gridWithIntrinsicSizeBiggerThanFlex {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
 }
 
 .gridShrinkBelowItemsIntrinsicSize {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(0px, 1fr) minmax(0px, 2fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(0px, 1fr) minmax(0px, 2fr);
 }
 
 .gridWithNonFlexingItems {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
 }
 
 .thirdRowFirstColumn {

LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html

@@ -7,24 +7,24 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinFlexContent {
-    -webkit-grid-definition-columns: minmax(1fr, 50px);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(1fr, 50px);
+    -webkit-grid-template-rows: 50px;
 }
 .gridMaxFlexContent {
-    -webkit-grid-definition-columns: minmax(30px, 2fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(30px, 2fr);
+    -webkit-grid-template-rows: 50px;
 }
 .gridTwoMaxFlexContent {
-    -webkit-grid-definition-columns: minmax(10px, 1fr) minmax(10px, 2fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(10px, 1fr) minmax(10px, 2fr);
+    -webkit-grid-template-rows: 50px;
 }
 .gridTwoDoubleMaxFlexContent {
-    -webkit-grid-definition-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
+    -webkit-grid-template-rows: 50px;
 }
 .gridIgnoreSecondGridItem {
-    -webkit-grid-definition-columns: minmax(300px, 3fr) minmax(150px, 1fr);
-    -webkit-grid-definition-rows: 50px;
+    -webkit-grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr);
+    -webkit-grid-template-rows: 50px;
 }
 </style>
 <script src="../../resources/check-layout.js"></script>

LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html

@@ -7,20 +7,20 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinFlexContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(1fr, 50px);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(1fr, 50px);
 }
 .gridMaxFlexContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(30px, 2fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(30px, 2fr);
 }
 .gridTwoMaxFlexContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(10px, 1fr) minmax(10px, 2fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(10px, 1fr) minmax(10px, 2fr);
 }
 .gridTwoDoubleMaxFlexContent {
-    -webkit-grid-definition-columns: 50px;
-    -webkit-grid-definition-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
+    -webkit-grid-template-columns: 50px;
+    -webkit-grid-template-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
 }
 </style>
 <script src="../../resources/check-layout.js"></script>

LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html

@@ -8,8 +8,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    -webkit-grid-definition-rows: 5px;
-    -webkit-grid-definition-columns: 10px;
+    -webkit-grid-template-rows: 5px;
+    -webkit-grid-template-columns: 10px;
 }
 
 .gridAutoFixedFixed {

LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html

@@ -8,8 +8,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    -webkit-grid-definition-rows: 20px;
-    -webkit-grid-definition-columns: 10px;
+    -webkit-grid-template-rows: 20px;
+    -webkit-grid-template-columns: 10px;
 }
 
 .gridAutoFixedFixed {

LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html

@@ -8,8 +8,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    -webkit-grid-definition-rows: 20px;
-    -webkit-grid-definition-columns: 10px;
+    -webkit-grid-template-rows: 20px;
+    -webkit-grid-template-columns: 10px;
     -webkit-grid-auto-rows: 30px;
     -webkit-grid-auto-columns: 50px;
     font: 10px/1 Ahem;

LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html

@@ -7,13 +7,13 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .smallGrid {
-    -webkit-grid-definition-columns: 50px 100px;
-    -webkit-grid-definition-rows: 50px 100px;
+    -webkit-grid-template-columns: 50px 100px;
+    -webkit-grid-template-rows: 50px 100px;
 }
 
 .bigGrid {
-    -webkit-grid-definition-columns: 50px 100px 150px 200px;
-    -webkit-grid-definition-rows: 50px 100px 150px 200px;
+    -webkit-grid-template-columns: 50px 100px 150px 200px;
+    -webkit-grid-template-rows: 50px 100px 150px 200px;
 }
 
 .overflowingRowFirstColumn {

LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html

@@ -8,8 +8,8 @@
 <script src="../../resources/check-layout.js"></script>
 <style>
 .grid {
-    -webkit-grid-definition-columns: 50px 100px;
-    -webkit-grid-definition-rows: 50px 100px;
+    -webkit-grid-template-columns: 50px 100px;
+    -webkit-grid-template-rows: 50px 100px;
 }
 </style>
 <script>