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

BUG=337626

Review URL: https://codereview.chromium.org/146773002

git-svn-id: svn://svn.chromium.org/blink/trunk@166143 bbb929c8-8fbe-4397-9dbb-9b2b20218538

133 files changed, 1623 insertions, 1623 deletions

diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
index c417279..788b7a5 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    grid-definition-columns: auto;
-    grid-definition-rows: 50px;
+    grid-template-columns: auto;
+    grid-template-rows: 50px;
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
index edc431b..709bfd6 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: auto;
+    grid-template-columns: 50px;
+    grid-template-rows: auto;
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
index 00c40a1..8b70a69 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 100px 10vw;
-    grid-definition-rows: 10vh 100px;
+    grid-template-columns: 100px 10vw;
+    grid-template-rows: 10vh 100px;
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
index b48a6ea..1ced56c 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 100px 300px;
-    grid-definition-rows: 50px 150px;
+    grid-template-columns: 100px 300px;
+    grid-template-rows: 50px 150px;
     height: 200px;
     width: 400px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
index 37ab81b..aecb2e7 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
@@ -7,28 +7,28 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMaxMaxContent {
-    grid-definition-columns: minmax(10px, max-content) minmax(10px, 1fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(10px, max-content) minmax(10px, 1fr);
+    grid-template-rows: 50px;
 }
 
 .gridMinMinContent {
-    grid-definition-columns: minmax(10px, 1fr) minmax(min-content, 50px);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(10px, 1fr) minmax(min-content, 50px);
+    grid-template-rows: 50px;
 }
 
 .gridWithIntrinsicSizeBiggerThanFlex {
-    grid-definition-columns: minmax(min-content, 0.5fr) minmax(18px, 2fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(min-content, 0.5fr) minmax(18px, 2fr);
+    grid-template-rows: 50px;
 }
 
 .gridShrinkBelowItemsIntrinsicSize {
-    grid-definition-columns: minmax(0px, 1fr) minmax(0px, 2fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(0px, 1fr) minmax(0px, 2fr);
+    grid-template-rows: 50px;
 }
 
 .gridWithNonFlexingItems {
-    grid-definition-columns: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr);
+    grid-template-rows: 50px;
 }
 
 .firstRowThirdColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
index 504a985..f12755b 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
@@ -7,28 +7,28 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMaxMaxContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(10px, max-content) minmax(10px, 1fr);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(10px, max-content) minmax(10px, 1fr);
 }
 
 .gridMinMinContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(10px, 1fr) minmax(min-content, 50px);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(10px, 1fr) minmax(min-content, 50px);
 }
 
 .gridWithIntrinsicSizeBiggerThanFlex {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(min-content, 0.5fr) minmax(18px, 2fr);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(min-content, 0.5fr) minmax(18px, 2fr);
 }
 
 .gridShrinkBelowItemsIntrinsicSize {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(0px, 1fr) minmax(0px, 2fr);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(0px, 1fr) minmax(0px, 2fr);
 }
 
 .gridWithNonFlexingItems {
-    grid-definition-columns: 50px;
-    grid-definition-rows: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr);
+    grid-template-columns: 50px;
+    grid-template-rows: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr);
 }
 
 .thirdRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
index 5b52450..046f9c3 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
@@ -7,24 +7,24 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinFlexContent {
-    grid-definition-columns: minmax(1fr, 50px);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(1fr, 50px);
+    grid-template-rows: 50px;
 }
 .gridMaxFlexContent {
-    grid-definition-columns: minmax(30px, 2fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(30px, 2fr);
+    grid-template-rows: 50px;
 }
 .gridTwoMaxFlexContent {
-    grid-definition-columns: minmax(10px, 1fr) minmax(10px, 2fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(10px, 1fr) minmax(10px, 2fr);
+    grid-template-rows: 50px;
 }
 .gridTwoDoubleMaxFlexContent {
-    grid-definition-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
+    grid-template-rows: 50px;
 }
 .gridIgnoreSecondGridItem {
-    grid-definition-columns: minmax(300px, 3fr) minmax(150px, 1fr);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr);
+    grid-template-rows: 50px;
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
index ad5619a..b38bd7a 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
@@ -7,20 +7,20 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinFlexContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(1fr, 50px);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(1fr, 50px);
 }
 .gridMaxFlexContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(30px, 2fr);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(30px, 2fr);
 }
 .gridTwoMaxFlexContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(10px, 1fr) minmax(10px, 2fr);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(10px, 1fr) minmax(10px, 2fr);
 }
 .gridTwoDoubleMaxFlexContent {
-    grid-definition-columns: 50px;
-    grid-definition-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
index caa0b2f..8538e25 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
@@ -8,8 +8,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 5px;
-    grid-definition-columns: 10px;
+    grid-template-rows: 5px;
+    grid-template-columns: 10px;
 }
 
 .gridAutoFixedFixed {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
index 3eb7f8f..54b5f76 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
@@ -8,8 +8,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 20px;
-    grid-definition-columns: 10px;
+    grid-template-rows: 20px;
+    grid-template-columns: 10px;
 }
 
 .gridAutoFixedFixed {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
index df64849..d11e6a7 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
@@ -8,8 +8,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 20px;
-    grid-definition-columns: 10px;
+    grid-template-rows: 20px;
+    grid-template-columns: 10px;
     grid-auto-rows: 30px;
     grid-auto-columns: 50px;
     font: 10px/1 Ahem;
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
index e32fc28..cc18510 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
@@ -7,13 +7,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .smallGrid {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 50px 100px;
 }
 
 .bigGrid {
-    grid-definition-columns: 50px 100px 150px 200px;
-    grid-definition-rows: 50px 100px 150px 200px;
+    grid-template-columns: 50px 100px 150px 200px;
+    grid-template-rows: 50px 100px 150px 200px;
 }
 
 .overflowingRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
index 3ee02f2..b3150d1 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
@@ -8,8 +8,8 @@ if (window.testRunner)
 <script src="../../resources/check-layout.js"></script>
 <style>
 .grid {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 50px 100px;
 }
 </style>
 <script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
index e3cb524..a9edca7 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
@@ -1,187 +1,187 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
+Test that setting and getting grid-template-columns and grid-template-rows works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-columns') is "10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-columns') is "400px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-rows') is "150px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-definition-columns') is "7px"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithAutoWithoutSizeElement, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithAutoWithoutSizeElement, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-definition-columns') is "7px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-columns') is "100px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-rows') is "150px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-definition-columns') is "64px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-definition-rows') is "60px"
-PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('grid-definition-columns') is "80px"
-PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('grid-definition-rows') is "300px"
-PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('grid-definition-columns') is "17px"
-PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-definition-columns') is "17px"
-PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-definition-columns') is "800px"
-PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-definition-rows') is "600px"
-PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-definition-columns') is "150px"
-PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-definition-rows') is "75px"
-PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-definition-columns') is "550px"
-PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-definition-rows') is "465px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-definition-columns') is "80px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-definition-rows') is "300px"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-definition-columns') is "415px"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-definition-rows') is "300px"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "400px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "7px"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithAutoWithoutSizeElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithAutoWithoutSizeElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-columns') is "7px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-columns') is "64px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('grid-template-rows') is "300px"
+PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('grid-template-columns') is "17px"
+PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-template-columns') is "17px"
+PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-template-columns') is "800px"
+PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('grid-template-rows') is "600px"
+PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-template-columns') is "150px"
+PASS window.getComputedStyle(gridWithCalcElement, '').getPropertyValue('grid-template-rows') is "75px"
+PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-template-columns') is "550px"
+PASS window.getComputedStyle(gridWithCalcComplexElement, '').getPropertyValue('grid-template-rows') is "465px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMaxElement, '').getPropertyValue('grid-template-rows') is "300px"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-template-columns') is "415px"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMaxElement, '').getPropertyValue('grid-template-rows') is "300px"
 
-Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-definition-rows') is "none"
+Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-rows') is "none"
 
 Test the initial value
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 
-Test getting and setting grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px"
-PASS element.style.gridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px"
-PASS element.style.gridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "440px"
-PASS element.style.gridDefinitionColumns is "55%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "240px"
-PASS element.style.gridDefinitionRows is "40%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS element.style.gridDefinitionColumns is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS element.style.gridDefinitionRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "80px"
-PASS element.style.gridDefinitionColumns is "10vw"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "150px"
-PASS element.style.gridDefinitionRows is "25vh"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS element.style.gridDefinitionColumns is "min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS element.style.gridDefinitionRows is "min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS element.style.gridDefinitionColumns is "max-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS element.style.gridDefinitionRows is "max-content"
+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "440px"
+PASS element.style.gridTemplateColumns is "55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px"
+PASS element.style.gridTemplateRows is "40%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "80px"
+PASS element.style.gridTemplateColumns is "10vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "150px"
+PASS element.style.gridTemplateRows is "25vh"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "max-content"
 
-Test getting and setting grid-definition-columns and grid-definition-rows to minmax() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "440px"
-PASS element.style.gridDefinitionColumns is "minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "240px"
-PASS element.style.gridDefinitionRows is "minmax(30px, 40%)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "220px"
-PASS element.style.gridDefinitionColumns is "minmax(22em, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "80px"
-PASS element.style.gridDefinitionRows is "minmax(10vw, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "48px"
-PASS element.style.gridDefinitionColumns is "minmax(min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "80px"
-PASS element.style.gridDefinitionRows is "minmax(10vw, min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "220px"
-PASS element.style.gridDefinitionColumns is "minmax(22em, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "50px"
-PASS element.style.gridDefinitionRows is "minmax(max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS element.style.gridDefinitionColumns is "minmax(min-content, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px"
-PASS element.style.gridDefinitionRows is "minmax(max-content, min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "800px"
-PASS element.style.gridDefinitionColumns is "3600fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "600px"
-PASS element.style.gridDefinitionRows is "154fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "800px"
-PASS element.style.gridDefinitionColumns is "3.1459fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "600px"
-PASS element.style.gridDefinitionRows is "2.718fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "800px"
-PASS element.style.gridDefinitionColumns is "3fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "600px"
-PASS element.style.gridDefinitionRows is "4fr"
+Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "440px"
+PASS element.style.gridTemplateColumns is "minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "220px"
+PASS element.style.gridTemplateColumns is "minmax(22em, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
+PASS element.style.gridTemplateRows is "minmax(10vw, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "48px"
+PASS element.style.gridTemplateColumns is "minmax(min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
+PASS element.style.gridTemplateRows is "minmax(10vw, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "220px"
+PASS element.style.gridTemplateColumns is "minmax(22em, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px"
+PASS element.style.gridTemplateRows is "minmax(max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
+PASS element.style.gridTemplateColumns is "minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
+PASS element.style.gridTemplateRows is "minmax(max-content, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
+PASS element.style.gridTemplateColumns is "3600fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px"
+PASS element.style.gridTemplateRows is "154fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
+PASS element.style.gridTemplateColumns is "3.1459fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px"
+PASS element.style.gridTemplateRows is "2.718fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
+PASS element.style.gridTemplateColumns is "3fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px"
+PASS element.style.gridTemplateRows is "4fr"
 
-Test getting and setting grid-definition-columns and grid-definition-rows to calc() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "150px"
-PASS element.style.gridDefinitionColumns is "calc(150px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "75px"
-PASS element.style.gridDefinitionRows is "calc(75px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "370px"
-PASS element.style.gridDefinitionColumns is "calc(50% - 30px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "135px"
-PASS element.style.gridDefinitionRows is "calc(75px + 10%)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "200px"
-PASS element.style.gridDefinitionColumns is "minmax(25%, calc(30px))"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "450px"
-PASS element.style.gridDefinitionRows is "minmax(calc(75%), 40px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "110px"
-PASS element.style.gridDefinitionColumns is "minmax(10%, calc(30px + 10%))"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "200px"
-PASS element.style.gridDefinitionRows is "minmax(calc(25% - 50px), 200px)"
+Test getting and setting grid-template-columns and grid-template-rows to calc() values through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "150px"
+PASS element.style.gridTemplateColumns is "calc(150px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "75px"
+PASS element.style.gridTemplateRows is "calc(75px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "370px"
+PASS element.style.gridTemplateColumns is "calc(50% - 30px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "135px"
+PASS element.style.gridTemplateRows is "calc(75px + 10%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "200px"
+PASS element.style.gridTemplateColumns is "minmax(25%, calc(30px))"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "450px"
+PASS element.style.gridTemplateRows is "minmax(calc(75%), 40px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "110px"
+PASS element.style.gridTemplateColumns is "minmax(10%, calc(30px + 10%))"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "200px"
+PASS element.style.gridTemplateRows is "minmax(calc(25% - 50px), 200px)"
 
-Test setting grid-definition-columns and grid-definition-rows to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
+Test setting grid-template-columns and grid-template-rows to bad values through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
 
-Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px"
-PASS element.style.gridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px"
-PASS element.style.gridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS element.style.gridDefinitionColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS element.style.gridDefinitionRows is "none"
+Test setting grid-template-columns and grid-template-rows back to 'none' through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "none"
 
-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is '50px (last)'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is '(first) 101px'
+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '50px (last)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '(first) 101px'
 
-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is '450px (last)'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is '(first) 150px'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '450px (last)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '(first) 150px'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
index b903d57..0687a69 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
@@ -1,129 +1,129 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
+Test that setting and getting grid-template-columns and grid-template-rows works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting |grid-definition-columns| and |grid-definition-rows| set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-columns') is "7px 11px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-columns') is "424px 792px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-rows') is "162px 312px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-definition-columns') is "7px 0px"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-definition-rows') is "11px 0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-columns') is "0px 17px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-rows') is "0px 3px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-columns') is "100px 120px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-rows') is "150px 170px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-definition-columns') is "15px 0px 100px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-definition-rows') is "120px 18px 0px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-definition-columns') is "400px 120px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-definition-rows') is "210px 168px"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-definition-columns') is "0px 0px"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-definition-rows') is "0px 0px"
-PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('grid-definition-columns') is "7px 17px"
-PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('grid-definition-rows') is "11px 3px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-definition-columns') is "240px 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-definition-rows') is "120px 210px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-definition-columns') is "240px 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-definition-rows') is "120px 210px"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-definition-columns') is "320px 480px"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-definition-rows') is "225px 375px"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-definition-columns') is "45px 755px"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-definition-rows') is "586px 14px"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-definition-columns') is "200px 100px"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-definition-rows') is "150px 75px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-definition-columns') is "400px 80px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-definition-rows') is "88px 150px"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-definition-columns') is "190px 80px"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-definition-rows') is "150px 53px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-definition-columns') is "400px 120px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-definition-rows') is "150px 175px"
+Test getting |grid-template-columns| and |grid-template-rows| set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "7px 11px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "17px 2px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px 792px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px 312px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "7px 0px"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "11px 0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "0px 17px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px 3px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px 120px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px 170px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-columns') is "15px 0px 100px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-rows') is "120px 18px 0px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-columns') is "400px 120px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-rows') is "210px 168px"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-columns') is "0px 0px"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-rows') is "0px 0px"
+PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('grid-template-columns') is "7px 17px"
+PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('grid-template-rows') is "11px 3px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-columns') is "240px 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-rows') is "120px 210px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-columns') is "240px 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-rows') is "120px 210px"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-columns') is "320px 480px"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-rows') is "225px 375px"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-columns') is "45px 755px"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-rows') is "586px 14px"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-columns') is "200px 100px"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-rows') is "150px 75px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-columns') is "400px 80px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-rows') is "88px 150px"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-columns') is "190px 80px"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-rows') is "150px 53px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "400px 120px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "150px 175px"
 
 Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 
-Test getting and setting grid-definition-rows and grid-definition-columns through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px 22px"
-PASS element.style.gridDefinitionColumns is "18px 22px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px 70px"
-PASS element.style.gridDefinitionRows is "66px 70px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "440px 640px"
-PASS element.style.gridDefinitionColumns is "55% 80%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "240px 378px"
-PASS element.style.gridDefinitionRows is "40% 63%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "0px 0px"
-PASS element.style.gridDefinitionColumns is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px 0px"
-PASS element.style.gridDefinitionRows is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "0px 160px 22px"
-PASS element.style.gridDefinitionColumns is "auto 16em 22px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "336px 100px 0px"
-PASS element.style.gridDefinitionRows is "56% 10em auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "160px 20px"
-PASS element.style.gridDefinitionColumns is "16em minmax(16px, 20px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "90px 0px"
-PASS element.style.gridDefinitionRows is "minmax(10%, 15%) auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "160px 640px"
-PASS element.style.gridDefinitionColumns is "16em 2fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "600px 0px"
-PASS element.style.gridDefinitionRows is "14fr auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "400px 96px"
-PASS element.style.gridDefinitionColumns is "50% 12vw"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "30px 510px"
-PASS element.style.gridDefinitionRows is "5% 85vh"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "25px 20px"
-PASS element.style.gridDefinitionColumns is "calc(25px) calc(2em)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px 60px"
-PASS element.style.gridDefinitionRows is "auto calc(10%)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "345px 92px"
-PASS element.style.gridDefinitionColumns is "calc(25px + 40%) minmax(min-content, calc(10% + 12px))"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "100px 0px"
-PASS element.style.gridDefinitionRows is "minmax(calc(75% - 350px), max-content) auto"
+Test getting and setting grid-template-rows and grid-template-columns through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px 22px"
+PASS element.style.gridTemplateColumns is "18px 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px 70px"
+PASS element.style.gridTemplateRows is "66px 70px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "440px 640px"
+PASS element.style.gridTemplateColumns is "55% 80%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px 378px"
+PASS element.style.gridTemplateRows is "40% 63%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 0px"
+PASS element.style.gridTemplateColumns is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px 0px"
+PASS element.style.gridTemplateRows is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 160px 22px"
+PASS element.style.gridTemplateColumns is "auto 16em 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "336px 100px 0px"
+PASS element.style.gridTemplateRows is "56% 10em auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px 20px"
+PASS element.style.gridTemplateColumns is "16em minmax(16px, 20px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "90px 0px"
+PASS element.style.gridTemplateRows is "minmax(10%, 15%) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px 640px"
+PASS element.style.gridTemplateColumns is "16em 2fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "600px 0px"
+PASS element.style.gridTemplateRows is "14fr auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "400px 96px"
+PASS element.style.gridTemplateColumns is "50% 12vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "30px 510px"
+PASS element.style.gridTemplateRows is "5% 85vh"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "25px 20px"
+PASS element.style.gridTemplateColumns is "calc(25px) calc(2em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px 60px"
+PASS element.style.gridTemplateRows is "auto calc(10%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "345px 92px"
+PASS element.style.gridTemplateColumns is "calc(25px + 40%) minmax(min-content, calc(10% + 12px))"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "100px 0px"
+PASS element.style.gridTemplateRows is "minmax(calc(75% - 350px), max-content) auto"
 
 Test getting wrong values set from CSS
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-rows') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows') is 'none'
 
 Test setting and getting wrong values from JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
 
-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "50px 750px (last)"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "20px (middle) 45px"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "50px 0px (last)"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "20px (middle) 45px"
+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 750px (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20px (middle) 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 0px (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "20px (middle) 45px"
 
-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "1200px (middle) 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "200px (line) 400px (line)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "1200px (middle) 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "200px (line) 400px (line)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
index 25707c2..1887149 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
@@ -28,83 +28,83 @@ if (window.testRunner)
 }
 
 .gridWithFixed {
-    grid-definition-columns: 7px 11px;
-    grid-definition-rows: 17px 2px;
+    grid-template-columns: 7px 11px;
+    grid-template-rows: 17px 2px;
 }
 
 .gridWithPercent {
-    grid-definition-columns: 53% 99%;
-    grid-definition-rows: 27% 52%;
+    grid-template-columns: 53% 99%;
+    grid-template-rows: 27% 52%;
 }
 .gridWithAuto {
-    grid-definition-columns: auto auto;
-    grid-definition-rows: auto auto;
+    grid-template-columns: auto auto;
+    grid-template-rows: auto auto;
 }
 .gridWithEM {
-    grid-definition-columns: 10em 12em;
-    grid-definition-rows: 15em 17em;
+    grid-template-columns: 10em 12em;
+    grid-template-rows: 15em 17em;
     font: 10px Ahem;
 }
 .gridWithNoneAndAuto {
-    grid-definition-columns: none auto;
-    grid-definition-rows: none auto;
+    grid-template-columns: none auto;
+    grid-template-rows: none auto;
 }
 .gridNoneWithAndFixed {
-    grid-definition-columns: none 15px;
-    grid-definition-rows: none 22px;
+    grid-template-columns: none 15px;
+    grid-template-rows: none 22px;
 }
 .gridWithThreeItems {
-    grid-definition-columns: 15px auto 10em;
-    grid-definition-rows: 12em 18px auto;
+    grid-template-columns: 15px auto 10em;
+    grid-template-rows: 12em 18px auto;
     font: 10px Ahem;
 }
 .gridWithPercentAndViewportPercent {
-    grid-definition-columns: 50% 15vw;
-    grid-definition-rows: 35% 28vh;
+    grid-template-columns: 50% 15vw;
+    grid-template-rows: 35% 28vh;
 }
 .gridWithFitContentAndFitAvailable {
-    grid-definition-columns: -webkit-content-available;
-    grid-definition-rows: -webkit-fit-content -webkit-fit-available;
+    grid-template-columns: -webkit-content-available;
+    grid-template-rows: -webkit-fit-content -webkit-fit-available;
 }
 .gridWithMinMaxContent {
-    grid-definition-columns: min-content max-content;
-    grid-definition-rows: max-content min-content;
+    grid-template-columns: min-content max-content;
+    grid-template-rows: max-content min-content;
 }
 .gridWithMinMaxAndFixed {
-    grid-definition-columns: minmax(45px, 30%) 15px;
-    grid-definition-rows: 12em minmax(35%, 10px);
+    grid-template-columns: minmax(45px, 30%) 15px;
+    grid-template-rows: 12em minmax(35%, 10px);
     font: 10px Ahem;
 }
 .gridWithMinMaxAndMinMaxContent {
-    grid-definition-columns: minmax(min-content, 30%) 15px;
-    grid-definition-rows: 12em minmax(35%, max-content);
+    grid-template-columns: minmax(min-content, 30%) 15px;
+    grid-template-rows: 12em minmax(35%, max-content);
     font: 10px Ahem;
 }
 .gridWithFractionFraction {
-    grid-definition-columns: 2fr 3fr;
-    grid-definition-rows: 3fr 5fr;
+    grid-template-columns: 2fr 3fr;
+    grid-template-rows: 3fr 5fr;
 }
 .gridWithFractionMinMax {
-    grid-definition-columns: minmax(min-content, 45px) 2fr;
-    grid-definition-rows: 3fr minmax(14px, max-content);
+    grid-template-columns: minmax(min-content, 45px) 2fr;
+    grid-template-rows: 3fr minmax(14px, max-content);
 }
 .gridWithCalcCalc {
-    grid-definition-columns: calc(200px) calc(10em);
-    grid-definition-rows: calc(15em) calc(75px);
+    grid-template-columns: calc(200px) calc(10em);
+    grid-template-rows: calc(15em) calc(75px);
     font: 10px Ahem;
 }
 .gridWithCalcAndFixed {
-    grid-definition-columns: calc(50%) 8em;
-    grid-definition-rows: 88px calc(25%);
+    grid-template-columns: calc(50%) 8em;
+    grid-template-rows: 88px calc(25%);
     font: 10px Ahem;
 }
 .gridWithCalcAndMinMax {
-    grid-definition-columns: calc(30px + 20%) minmax(min-content, 80px);
-    grid-definition-rows: minmax(25%, max-content) calc(10% - 7px);
+    grid-template-columns: calc(30px + 20%) minmax(min-content, 80px);
+    grid-template-rows: minmax(25%, max-content) calc(10% - 7px);
 }
 .gridWithCalcInsideMinMax {
-    grid-definition-columns: minmax(calc(23px + 10%), 400px) 12em;
-    grid-definition-rows: calc(150px) minmax(5%, calc(50% - 125px));
+    grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
+    grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
     font: 10px Ahem;
 }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
index d87ca42..c961142 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
@@ -21,69 +21,69 @@
     height: 3px;
 }
 .gridWithNone {
-    grid-definition-columns: none;
-    grid-definition-rows: none;
+    grid-template-columns: none;
+    grid-template-rows: none;
 }
 .gridWithFixed {
-    grid-definition-columns: 10px;
-    grid-definition-rows: 15px;
+    grid-template-columns: 10px;
+    grid-template-rows: 15px;
 }
 .gridWithPercent {
-    grid-definition-columns: 50%;
-    grid-definition-rows: 25%;
+    grid-template-columns: 50%;
+    grid-template-rows: 25%;
 }
 .gridWithAuto {
-    grid-definition-columns: auto;
-    grid-definition-rows: auto;
+    grid-template-columns: auto;
+    grid-template-rows: auto;
 }
 .gridWithEM {
-    grid-definition-columns: 10em;
-    grid-definition-rows: 15em;
+    grid-template-columns: 10em;
+    grid-template-rows: 15em;
     font: 10px Ahem;
 }
 .gridWithViewPortPercentage {
-    grid-definition-columns: 8vw;
-    grid-definition-rows: 10vh;
+    grid-template-columns: 8vw;
+    grid-template-rows: 10vh;
 }
 .gridWithFitContent {
-    grid-definition-columns: -webkit-fit-content;
-    grid-definition-rows: -webkit-fit-content;
+    grid-template-columns: -webkit-fit-content;
+    grid-template-rows: -webkit-fit-content;
 }
 .gridWithFitAvailable {
-    grid-definition-columns: -webkit-fit-available;
-    grid-definition-rows: -webkit-fit-available;
+    grid-template-columns: -webkit-fit-available;
+    grid-template-rows: -webkit-fit-available;
 }
 .gridWithMinMax {
-    grid-definition-columns: minmax(10%, 15px);
-    grid-definition-rows: minmax(20px, 50%);
+    grid-template-columns: minmax(10%, 15px);
+    grid-template-rows: minmax(20px, 50%);
 }
 .gridWithMinContent {
-    grid-definition-columns: min-content;
-    grid-definition-rows: min-content;
+    grid-template-columns: min-content;
+    grid-template-rows: min-content;
 }
 .gridWithMaxContent {
-    grid-definition-columns: max-content;
-    grid-definition-rows: max-content;
+    grid-template-columns: max-content;
+    grid-template-rows: max-content;
 }
 .gridWithFraction {
-    grid-definition-columns: 1fr;
-    grid-definition-rows: 2fr;
+    grid-template-columns: 1fr;
+    grid-template-rows: 2fr;
 }
 .gridWithCalc {
-    grid-definition-columns: calc(150px);
-    grid-definition-rows: calc(75px);
+    grid-template-columns: calc(150px);
+    grid-template-rows: calc(75px);
 }
 .gridWithCalcComplex {
-    grid-definition-columns: calc(50% + 150px);
-    grid-definition-rows: calc(65% + 75px);
+    grid-template-columns: calc(50% + 150px);
+    grid-template-rows: calc(65% + 75px);
 }
 .gridWithCalcInsideMinMax {
-    grid-definition-columns: minmax(10%, calc(15px));
-    grid-definition-rows: minmax(calc(20px), 50%);
+    grid-template-columns: minmax(10%, calc(15px));
+    grid-template-rows: minmax(calc(20px), 50%);
 }
 .gridWithCalcComplexInsideMinMax {
-    grid-definition-columns: minmax(10%, calc(50% + 15px));
-    grid-definition-rows: minmax(calc(20px + 10%), 50%);
+    grid-template-columns: minmax(10%, calc(50% + 15px));
+    grid-template-rows: minmax(calc(20px + 10%), 50%);
 }
 </style>
 <script src="../../resources/js-test.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-explicit-grid-recompute-child.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-explicit-grid-recompute-child.html
index ff1d36d..2ac159d 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-explicit-grid-recompute-child.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-explicit-grid-recompute-child.html
@@ -26,11 +26,11 @@ if (window.testRunner)
 }
 </style>
 <script>
-function testGridDefinitions(gridDefinitionRows, gridDefinitionColumns, firstGridItemData, secondGridItemData, thirdGridItemData)
+function testGridDefinitions(gridTemplateRows, gridTemplateColumns, firstGridItemData, secondGridItemData, thirdGridItemData)
 {
     var gridElement = document.getElementsByClassName("grid")[0];
-    gridElement.style.gridDefinitionRows = gridDefinitionRows;
-    gridElement.style.gridDefinitionColumns = gridDefinitionColumns;
+    gridElement.style.gridTemplateRows = gridTemplateRows;
+    gridElement.style.gridTemplateColumns = gridTemplateColumns;
 
     var firstGridItem = document.getElementById("firstGridItem");
     firstGridItem.setAttribute("data-expected-width", firstGridItemData.width);
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
index b8daa8c..a805eb3 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
@@ -26,11 +26,11 @@ if (window.testRunner)
 }
 </style>
 <script>
-function testGridDefinitions(gridDefinitionRows, gridDefinitionColumns, firstGridItemData, secondGridItemData, thirdGridItemData)
+function testGridDefinitions(gridTemplateRows, gridTemplateColumns, firstGridItemData, secondGridItemData, thirdGridItemData)
 {
     var gridElement = document.getElementsByClassName("grid")[0];
-    gridElement.style.gridDefinitionRows = gridDefinitionRows;
-    gridElement.style.gridDefinitionColumns = gridDefinitionColumns;
+    gridElement.style.gridTemplateRows = gridTemplateRows;
+    gridElement.style.gridTemplateColumns = gridTemplateColumns;
 
     var firstGridItem = document.getElementById("firstGridItem");
     firstGridItem.setAttribute("data-expected-width", firstGridItemData.width);
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
index 0a8131f..e4713a3 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
@@ -10,8 +10,8 @@ if (window.testRunner)
 function testLayout(gridElementID, gridTracks, size)
 {
     var gridElement = document.getElementById(gridElementID);
-    gridElement.style.gridDefinitionColumns = gridTracks.columns;
-    gridElement.style.gridDefinitionRows = gridTracks.rows;
+    gridElement.style.gridTemplateColumns = gridTracks.columns;
+    gridElement.style.gridTemplateRows = gridTracks.rows;
     var gridItem = gridElement.firstChild.nextSibling;
     gridItem.setAttribute("data-expected-width", size.width);
     gridItem.setAttribute("data-expected-height", size.height);
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
index 21ddaf8..a6251c5 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
@@ -12,8 +12,8 @@ if (window.testRunner)
     border-right: 30px dotted blue;
     border-bottom: 40px dotted blue;
     border-left: 50px dotted blue;
-    grid-definition-rows: 100px 100px;
-    grid-definition-columns: 100px 100px;
+    grid-template-rows: 100px 100px;
+    grid-template-columns: 100px 100px;
     width: 200px;
 }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
index 13effd8..9aec6ad 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
@@ -13,8 +13,8 @@ if (window.testRunner)
     border-right: 20px dotted blue;
     border-bottom: 30px dotted blue;
     border-left: 40px dotted blue;
-    grid-definition-rows: 100px 100px;
-    grid-definition-columns: 100px 100px;
+    grid-template-rows: 100px 100px;
+    grid-template-columns: 100px 100px;
     width: 200px;
 }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt
index b883eff..34fca27 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt
@@ -1,4 +1,4 @@
-This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-definition-columns change should be seen.
+This test checks that changing the grid-template-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-template-columns change should be seen.
 (repaint rects
   (rect 8 48 100 50)
   (rect 8 48 50 50)
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
index 8bf14fd..725cfbe 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
@@ -8,7 +8,7 @@ if (window.testRunner)
 function repaintTest()
 {
     var gridElement = document.getElementsByClassName("grid")[0];
-    gridElement.style.gridDefinitionColumns = "minmax(50px, 180px) 100px 100px";
+    gridElement.style.gridTemplateColumns = "minmax(50px, 180px) 100px 100px";
 }
 window.addEventListener("load", runRepaintTest, false);
 </script>
@@ -20,15 +20,15 @@ body {
 
 .grid {
     width: -webkit-fit-content;
-    grid-definition-rows: 50px;
-    grid-definition-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
+    grid-template-rows: 50px;
+    grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
 }
 .sizedToGridArea {
     background-color: purple;
 }
 </style>
 <body>
-<div> This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-definition-columns change should be seen.</div>
+<div> This test checks that changing the grid-template-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-template-columns change should be seen.</div>
 <div class="constrainedContainer">
     <div class="grid">
         <div class="sizedToGridArea"></div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt
index 2c22542..24051fa 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt
@@ -1,4 +1,4 @@
-This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen.
+This test checks that changing the grid-template-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-template-rows change should be seen.
 (repaint rects
   (rect 8 48 100 50)
   (rect 8 48 100 100)
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
index eb43aae0..5d43a15 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
@@ -8,7 +8,7 @@ if (window.testRunner)
 function repaintTest()
 {
     var gridElement = document.getElementsByClassName("grid")[0];
-    gridElement.style.gridDefinitionRows = "100px 50px";
+    gridElement.style.gridTemplateRows = "100px 50px";
 }
 window.addEventListener("load", runRepaintTest, false);
 </script>
@@ -20,15 +20,15 @@ body {
 
 .grid {
     width: -webkit-fit-content;
-    grid-definition-rows: 50px 100px;
-    grid-definition-columns: 100px;
+    grid-template-rows: 50px 100px;
+    grid-template-columns: 100px;
 }
 .sizedToGridArea {
     background-color: purple;
 }
 </style>
 <body>
-<div>This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen.</div>
+<div>This test checks that changing the grid-template-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-template-rows change should be seen.</div>
 <div class="constrainedContainer">
     <div class="grid">
         <div class="sizedToGridArea"></div>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
index cb84c7d..05ddbd0 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
@@ -6,12 +6,12 @@
 <link href=resources/grid.css rel=stylesheet>
 <style>
 .gridNoRow {
-    grid-definition-columns: 50px;
+    grid-template-columns: 50px;
     /* Make the grid shrink-to-fit. */
     position: absolute;
 }
 .gridNoColumn {
-    grid-definition-rows: 50px 80px;
+    grid-template-rows: 50px 80px;
     /* Make the grid shrink-to-fit. */
     position: absolute;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
index a19d3292..b1957d3 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
@@ -4,13 +4,13 @@
 <style>
 .minHeightGrid {
     min-height: 100px;
-    grid-definition-columns: 40px;
-    grid-definition-rows: 50px;
+    grid-template-columns: 40px;
+    grid-template-rows: 50px;
 }
 .maxHeightGrid {
     max-height: 100px;
-    grid-definition-columns: 40px;
-    grid-definition-rows: 150px 50px;
+    grid-template-columns: 40px;
+    grid-template-rows: 150px 50px;
 }
 
 .minHeightAutoGrid {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
index 05a634b..f9441bf 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
@@ -9,13 +9,13 @@ if (window.testRunner)
 <style>
 .minWidthGrid {
     min-width: 100px;
-    grid-definition-columns: 50px;
-    grid-definition-rows: 40px;
+    grid-template-columns: 50px;
+    grid-template-rows: 40px;
 }
 .maxWidthGrid {
     max-width: 100px;
-    grid-definition-columns: 150px 50px;
-    grid-definition-rows: 40px;
+    grid-template-columns: 150px 50px;
+    grid-template-rows: 40px;
 }
 
 .minWidthAutoGrid {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
index 300b9df..ef98e28 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
@@ -9,8 +9,8 @@ if (window.testRunner)
 <style>
 .grid {
     padding: 20px 30px 40px 50px;
-    grid-definition-rows: 100px 100px;
-    grid-definition-columns: 100px 100px;
+    grid-template-rows: 100px 100px;
+    grid-template-columns: 100px 100px;
     width: 200px;
 }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
index af21348..f2f95a9 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 100px;
-    grid-definition-rows: 50px;
+    grid-template-columns: 100px;
+    grid-template-rows: 50px;
     /* Force the grid element to be shrink-to-fit. */
     position: absolute;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
index 57247a0..c77d621 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt
@@ -1,40 +1,40 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected
+Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('grid-definition-columns') is "120px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('grid-definition-rows') is "18px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('grid-definition-columns') is "0px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('grid-definition-rows') is "18px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-definition-columns') is "400px 400px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-definition-rows') is "0px 0px"
-PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('grid-definition-columns') is "400px 400px"
-PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('grid-definition-rows') is "44px 77px"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-definition-columns') is "33px 120px 0px 120px"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-definition-rows') is "10px 77px 10px 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "33px (middle) 250px (end) 0px (middle) 250px (end)"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "10px (start) 77px (end) 10px (start) 0px (end)"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "(before) 0px (before) 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "(before) 10px (before) 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "250px (end)"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "10px (end)"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "(start) 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "(start) 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-definition-columns') is "(start) 140px 250px 250px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-definition-rows') is "44px 10px 10px"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-definition-columns') is "250px 250px 120px (last)"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-definition-rows') is "10px 10px (end) 0px"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('grid-template-columns') is "120px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('grid-template-rows') is "18px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('grid-template-columns') is "0px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithoutSize, '').getPropertyValue('grid-template-rows') is "18px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-columns') is "400px 400px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-rows') is "0px 0px"
+PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('grid-template-columns') is "400px 400px"
+PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('grid-template-rows') is "44px 77px"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-columns') is "33px 120px 0px 120px"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-rows') is "10px 77px 10px 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "33px (middle) 250px (end) 0px (middle) 250px (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px (start) 77px (end) 10px (start) 0px (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "(before) 0px (before) 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "(before) 10px (before) 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "250px (end)"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px (end)"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "(start) 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "(start) 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-columns') is "(start) 140px 250px 250px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-rows') is "44px 10px 10px"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-columns') is "250px 250px 120px (last)"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-rows') is "10px 10px (end) 0px"
 
 Test invalid repeat syntax.
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
index 07e122f..2b4c5f6 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
@@ -28,48 +28,48 @@ if (window.testRunner)
 }
 
 .singleSingleTrackRepeat {
-    grid-definition-rows: repeat(1, 18px);
-    grid-definition-columns: repeat(1, 15%);
+    grid-template-rows: repeat(1, 18px);
+    grid-template-columns: repeat(1, 15%);
 }
 
 .twoSingleTrackRepeat {
-    grid-definition-rows: repeat(2, auto);
-    grid-definition-columns: repeat(2, minmax(15px, 50%));
+    grid-template-rows: repeat(2, auto);
+    grid-template-columns: repeat(2, minmax(15px, 50%));
 }
 
 .twoDoubleTrackRepeat {
-    grid-definition-rows: repeat(2, minmax(5px, 10px)  auto);
-    grid-definition-columns: repeat(2, auto minmax(100px, 120px));
+    grid-template-rows: repeat(2, minmax(5px, 10px)  auto);
+    grid-template-columns: repeat(2, auto minmax(100px, 120px));
 }
 
 .twoDoubleTrackWithNamedGridLineRepeat {
-    grid-definition-rows: repeat(2, 10px (start) auto (end));
-    grid-definition-columns: repeat(2, auto (middle) 250px (end));
+    grid-template-rows: repeat(2, 10px (start) auto (end));
+    grid-template-columns: repeat(2, auto (middle) 250px (end));
 }
 
 .twoDoubleTrackWithTrailingNamedGridLineRepeat {
-    grid-definition-rows: repeat(2, (before) 10px);
-    grid-definition-columns: repeat(2, (before) auto);
+    grid-template-rows: repeat(2, (before) 10px);
+    grid-template-columns: repeat(2, (before) auto);
 }
 
 .trailingNamedGridLineRepeat {
-    grid-definition-rows: repeat(1, 10px) (end);
-    grid-definition-columns: repeat(1, 250px) (end);
+    grid-template-rows: repeat(1, 10px) (end);
+    grid-template-columns: repeat(1, 250px) (end);
 }
 
 .leadingNamedGridLineRepeat {
-    grid-definition-rows: (start) repeat(2, 10px);
-    grid-definition-columns: (start) repeat(2, 250px);
+    grid-template-rows: (start) repeat(2, 10px);
+    grid-template-columns: (start) repeat(2, 250px);
 }
 
 .mixRepeatAfterNonRepeat {
-    grid-definition-rows: auto repeat(2, 10px);
-    grid-definition-columns: (start) 140px repeat(2, 250px);
+    grid-template-rows: auto repeat(2, 10px);
+    grid-template-columns: (start) 140px repeat(2, 250px);
 }
 
 .mixNonRepeatAfterRepeat {
-    grid-definition-rows: repeat(2, 10px) (end) auto;
-    grid-definition-columns: repeat(2, 250px) 15% (last);
+    grid-template-rows: repeat(2, 10px) (end) auto;
+    grid-template-columns: repeat(2, 250px) 15% (last);
 }
 </style>
 <script src="../../resources/js-test.js"></script>
@@ -100,9 +100,9 @@ if (window.testRunner)
 
 <script src="resources/grid-definitions-parsing-utils.js"></script>
 <script>
-    description('Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected');
+    description('Test that setting and getting grid-template-columns and grid-template-rows with repeat() 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("singleSingleTrackRepeatWithSize"), "120px", "18px");
     testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWithoutSize"), "0px", "18px");
     testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "400px 400px", "0px 0px");
@@ -120,8 +120,8 @@ if (window.testRunner)
     function testInvalidSyntax(gridColumn) {
         element = document.createElement("div");
         document.body.appendChild(element);
-        element.style.gridDefinitionColumns = gridColumn;
-        shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "none");
+        element.style.gridTemplateColumns = gridColumn;
+        shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
         document.body.removeChild(element);
     }
     testInvalidSyntax("repeat(");
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
index 4224756..a15b93a 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 50px 100px;
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
index 88f6d06..436293f 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridFixedContent {
-    grid-definition-columns: 50px minmax(min-content, 50px) minmax(max-content, 50px) minmax(50px, min-content);
-    grid-definition-rows: 70px minmax(max-content, 70px) minmax(50px, min-content) minmax(65px, max-content);
+    grid-template-columns: 50px minmax(min-content, 50px) minmax(max-content, 50px) minmax(50px, min-content);
+    grid-template-rows: 70px minmax(max-content, 70px) minmax(50px, min-content) minmax(65px, max-content);
 }
 
 .sizedToGridArea {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
index 0a7e4ab..28c4e80 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
@@ -3,8 +3,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 10px 20px;
-    grid-definition-columns: 30px 40px;
+    grid-template-rows: 10px 20px;
+    grid-template-columns: 30px 40px;
     grid-auto-flow: row;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
index b23fa78..e1b1224 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
@@ -3,8 +3,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: (firstRow) 10px 20px;
-    grid-definition-columns: (firstColumn) 30px 40px;
+    grid-template-rows: (firstRow) 10px 20px;
+    grid-template-columns: (firstColumn) 30px 40px;
     grid-auto-flow: row;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
index c86c016..ba2bc17 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
@@ -20,8 +20,8 @@ body {
 
 .grid {
     width: -webkit-fit-content;
-    grid-definition-rows: 50px;
-    grid-definition-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
+    grid-template-rows: 50px;
+    grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
 }
 .sizedToGridArea {
     background-color: purple;
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-order-auto-flow.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-order-auto-flow.html
index 290d1e2..43def90 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-order-auto-flow.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-order-auto-flow.html
@@ -9,8 +9,8 @@ if (window.testRunner)
 <style>
 .grid {
     grid-auto-flow: row;
-    grid-definition-rows: 50px 100px;
-    grid-definition-columns: 40px;
+    grid-template-rows: 50px 100px;
+    grid-template-columns: 40px;
 }
 
 #firstGridItem {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
index f1ec803..5c2f72d 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
@@ -19,8 +19,8 @@ body {
 }
 
 .grid {
-    grid-definition-rows: 50px 100px;
-    grid-definition-columns: 100px 50px;
+    grid-template-rows: 50px 100px;
+    grid-template-columns: 100px 50px;
     /* Make the grid shrink to fit. */
     position: absolute;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-display.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-display.html
index 315daf6..dd60924 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-display.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-display.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 50px 100px 200px;
-    grid-definition-rows: 50px 100px 200px;
+    grid-template-columns: 50px 100px 200px;
+    grid-template-rows: 50px 100px 200px;
     background-color: #aaa;
 }
 .grid > * {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
index b63ca80..8490fd9 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
@@ -4,8 +4,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 100px 100px;
-    grid-definition-columns: 100px 100px;
+    grid-template-rows: 100px 100px;
+    grid-template-columns: 100px 100px;
     width: 200px;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
index 7e66d66..1be91d3 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxAutoWithColumnMinMaxAuto {
-    grid-definition-columns: minmax(50px, 180px) auto;
-    grid-definition-rows: auto minmax(50px, 100px);
+    grid-template-columns: minmax(50px, 180px) auto;
+    grid-template-rows: auto minmax(50px, 100px);
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
index d72456d..eca3b77 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
@@ -8,8 +8,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: (before) 50px (middle) 100px (after);
-    grid-definition-columns: 40px 80px 160px;
+    grid-template-rows: (before) 50px (middle) 100px (after);
+    grid-template-columns: 40px 80px 160px;
 }
 
 .gridWithoutRepeat {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
index d8cdac4..d4741ab 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
@@ -8,13 +8,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridWithoutRepeat {
-    grid-definition-columns: (a) 50px (b) 100px (c) 200px (d);
-    grid-definition-rows: (e) 50px (f) 100px (g) 200px (h);
+    grid-template-columns: (a) 50px (b) 100px (c) 200px (d);
+    grid-template-rows: (e) 50px (f) 100px (g) 200px (h);
 }
 
 .gridWithRepeat {
-    grid-definition-columns: (b) 50px (b) 100px (b) 200px (b);
-    grid-definition-rows: (g) 50px (g) 100px (g) 200px (g);
+    grid-template-columns: (b) 50px (b) 100px (b) 200px (b);
+    grid-template-rows: (g) 50px (g) 100px (g) 200px (g);
 }
 
 .gridItemBToD {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
index 3f4e105..74c5291 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
@@ -7,14 +7,14 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .columnGrid {
-    grid-definition-columns: 50px 100px;
-    /* grid-definition-rows is left unset so that the grid items' row is implicit. */
+    grid-template-columns: 50px 100px;
+    /* grid-template-rows is left unset so that the grid items' row is implicit. */
     font: 10px/1 Ahem;
 }
 
 .rowGrid {
-    grid-definition-rows: 50px 100px;
-    /* grid-definition-columns is left unset so that the grid items' column is implicit. */
+    grid-template-rows: 50px 100px;
+    /* grid-template-columns is left unset so that the grid items' column is implicit. */
     font: 10px/1 Ahem;
 }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
index 5a959f5..3fb4850 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: (first) 50px (middle) 100px (last);
-    grid-definition-rows: (first) 50px (middle) 100px (last);
+    grid-template-columns: (first) 50px (middle) 100px (last);
+    grid-template-rows: (first) 50px (middle) 100px (last);
     /* To detect how much we extend the grid. */
     grid-auto-columns: 200px;
     grid-auto-rows: 200px;
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
index ae08939..f6b8ff1 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 50px 100px;
 }
 
 .negativeOrder {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
index 552cbe5..d0b5a7c 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
@@ -8,8 +8,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 100px;
-    grid-definition-columns: 100px;
+    grid-template-rows: 100px;
+    grid-template-columns: 100px;
     width: -webkit-fit-content;
 }
 .sizedToGridArea {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
index d29edc6..3ec4ea1 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
@@ -7,12 +7,12 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: (col) 50px (col) 100px (col) 200px (col);
-    grid-definition-rows: (row) 70px (row) 140px (row) 280px (row);
+    grid-template-columns: (col) 50px (col) 100px (col) 200px (col);
+    grid-template-rows: (row) 70px (row) 140px (row) 280px (row);
 }
 .differentNamedGridLines {
-    grid-definition-columns: (col1) 50px (col2) 100px (col3) 200px (col4);
-    grid-definition-rows: (row1) 70px (row2) 140px (row3) 280px (row4);
+    grid-template-columns: (col1) 50px (col2) 100px (col3) 200px (col4);
+    grid-template-rows: (row1) 70px (row2) 140px (row3) 280px (row4);
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
index c8ce155..6a40d58 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 50px 100px;
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
index d7d36fc..735fdcc 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
@@ -7,28 +7,28 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    grid-definition-columns: auto;
-    grid-definition-rows: auto;
+    grid-template-columns: auto;
+    grid-template-rows: auto;
 }
 
 .gridMinContentFixed {
-    grid-definition-columns: minmax(min-content, 100px);
-    grid-definition-rows: minmax(min-content, 40px);
+    grid-template-columns: minmax(min-content, 100px);
+    grid-template-rows: minmax(min-content, 40px);
 }
 
 .gridMaxContentFixed {
-    grid-definition-columns: minmax(max-content, 150px);
-    grid-definition-rows: minmax(max-content, 40px);
+    grid-template-columns: minmax(max-content, 150px);
+    grid-template-rows: minmax(max-content, 40px);
 }
 
 .gridFixedMinContent {
-    grid-definition-columns: minmax(100px, min-content);
-    grid-definition-rows: minmax(40px, min-content);
+    grid-template-columns: minmax(100px, min-content);
+    grid-template-rows: minmax(40px, min-content);
 }
 
 .gridFixedMaxContent {
-    grid-definition-columns: minmax(100px, max-content);
-    grid-definition-rows: minmax(40px, max-content);
+    grid-template-columns: minmax(100px, max-content);
+    grid-template-rows: minmax(40px, max-content);
 }
 
 .lessConstrainedContainer {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
index cbaabe2..e22492a 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
@@ -7,15 +7,15 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 40% 60%;
-    grid-definition-rows: 30% 70%;
+    grid-template-columns: 40% 60%;
+    grid-template-rows: 30% 70%;
     width: 400px;
     height: 300px;
 }
 
 #bigGrid {
-    grid-definition-columns: 25% 25% 25% 25%;
-    grid-definition-rows: 25% 25% 25% 25%;
+    grid-template-columns: 25% 25% 25% 25%;
+    grid-template-rows: 25% 25% 25% 25%;
     height: 100px;
     width: 200px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
index 94b03023..7f5d8d5 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
@@ -7,13 +7,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxMinMax {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: minmax(10px, min-content) minmax(50px, 100px);
+    grid-template-columns: 50px 100px;
+    grid-template-rows: minmax(10px, min-content) minmax(50px, 100px);
 }
 
 .gridAutoAuto {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: auto auto;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: auto auto;
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
index 6095977..4c22116 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 70px 140px;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 70px 140px;
 }
 
 #minHeightPercent {
@@ -26,7 +26,7 @@ if (window.testRunner)
 function testLayout(gridElementID, gridTracks, size)
 {
     var gridElement = document.getElementById(gridElementID);
-    gridElement.style.gridDefinitionRows = gridTracks.rows;
+    gridElement.style.gridTemplateRows = gridTracks.rows;
     var gridItem = gridElement.firstChild.nextSibling;
     gridItem.setAttribute("data-expected-width", size.width);
     gridItem.setAttribute("data-expected-height", size.height);
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
index 08bc9b8..a8de5d0 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context-expected.html
@@ -4,8 +4,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 100px;
-    grid-definition-columns: 200px 200px;
+    grid-template-rows: 100px;
+    grid-template-columns: 200px 200px;
     width: -webkit-fit-content;
     margin-top: 10px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
index 934893a..f632880 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html
@@ -4,8 +4,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-rows: 100px;
-    grid-definition-columns: 200px 200px;
+    grid-template-rows: 100px;
+    grid-template-columns: 200px 200px;
     width: -webkit-fit-content;
     margin-top: 10px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
index eb7e2ea..d7ca624 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
@@ -9,37 +9,37 @@
 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
 <style>
 .gridMinContentFixed {
-    grid-definition-columns: minmax(min-content, 40px) minmax(min-content, 40px);
-    grid-definition-rows: 10px;
+    grid-template-columns: minmax(min-content, 40px) minmax(min-content, 40px);
+    grid-template-rows: 10px;
     font: 10px/1 Ahem;
 }
 
 .gridFixedMinContent {
-    grid-definition-columns: minmax(30px, min-content) minmax(30px, min-content);
-    grid-definition-rows: 10px;
+    grid-template-columns: minmax(30px, min-content) minmax(30px, min-content);
+    grid-template-rows: 10px;
     font: 10px/1 Ahem;
 }
 
 .gridFixedMaxContent {
-    grid-definition-columns: minmax(40px, max-content) minmax(40px, max-content);
-    grid-definition-rows: 10px;
+    grid-template-columns: minmax(40px, max-content) minmax(40px, max-content);
+    grid-template-rows: 10px;
     font: 10px/1 Ahem;
 }
 
 .gridFixedFixed {
-    grid-definition-columns: minmax(30px, 40px) minmax(30px, 40px);
-    grid-definition-rows: 10px;
+    grid-template-columns: minmax(30px, 40px) minmax(30px, 40px);
+    grid-template-rows: 10px;
 }
 
 .gridAutoContent {
-    grid-definition-columns: auto auto;
-    grid-definition-rows: 10px;
+    grid-template-columns: auto auto;
+    grid-template-rows: 10px;
     font: 10px/1 Ahem;
 }
 
 .gridFixedFraction {
-    grid-definition-columns: minmax(10px, 1fr) minmax(2fr, 20px);
-    grid-definition-rows: 10px;
+    grid-template-columns: minmax(10px, 1fr) minmax(2fr, 20px);
+    grid-template-rows: 10px;
 }
 
 .margins {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
index 53ad672..ff99162 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    /* grid-definition-columns is left unset so that the grid item's column is implicit. */
-    grid-definition-rows: 50px;
+    /* grid-template-columns is left unset so that the grid item's column is implicit. */
+    grid-template-rows: 50px;
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
index fa964f1..557ad31 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridFixedContent {
-    grid-definition-columns: 50px minmax(min-content, 50px) minmax(max-content, 50px) minmax(50px, min-content);
-    grid-definition-rows: 70px minmax(max-content, 70px) minmax(50px, min-content) minmax(65px, max-content);
+    grid-template-columns: 50px minmax(min-content, 50px) minmax(max-content, 50px) minmax(50px, min-content);
+    grid-template-rows: 70px minmax(max-content, 70px) minmax(50px, min-content) minmax(65px, max-content);
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
index d0ddbeb..d452b0c 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
-    grid-definition-columns: 50px;
-    /* grid-definition-rows is left unset so that the grid item's row is implicit. */
+    grid-template-columns: 50px;
+    /* grid-template-rows is left unset so that the grid item's row is implicit. */
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/justify-self-cell.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/justify-self-cell.html
index f8852c6..202a784 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/justify-self-cell.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/justify-self-cell.html
@@ -3,8 +3,8 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 100px 100px;
-    grid-definition-rows: 200px 200px;
+    grid-template-columns: 100px 100px;
+    grid-template-rows: 200px 200px;
     width: -webkit-fit-content;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
index 2e618a2..53564f0 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
@@ -12,38 +12,38 @@ if (window.testRunner)
 }
 
 #grid1 {
-    grid-definition-columns: 30px;
-    grid-definition-rows: minmax(20px, 80px) 160px;
+    grid-template-columns: 30px;
+    grid-template-rows: minmax(20px, 80px) 160px;
 }
 
 #grid2 {
-    grid-definition-columns: 30px;
-    grid-definition-rows: minmax(50%, 120px) minmax(20px, 40%);
+    grid-template-columns: 30px;
+    grid-template-rows: minmax(50%, 120px) minmax(20px, 40%);
 }
 
 #grid3 {
-    grid-definition-columns: 30px;
+    grid-template-columns: 30px;
     /* Overlapping range. */
-    grid-definition-rows: minmax(10px, 180px) minmax(30px, 150px);
+    grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
 }
 
 #grid4 {
-    grid-definition-columns: 30px;
-    grid-definition-rows: minmax(20px, 80px) 60px;
+    grid-template-columns: 30px;
+    grid-template-rows: minmax(20px, 80px) 60px;
     -webkit-writing-mode: vertical-rl;
 }
 
 #grid5 {
-    grid-definition-columns: 30px;
+    grid-template-columns: 30px;
     /* 90% > 80px, 80px should be ignored. */
-    grid-definition-rows: minmax(90%, 80px) minmax(10px, 60%);
+    grid-template-rows: minmax(90%, 80px) minmax(10px, 60%);
     -webkit-writing-mode: vertical-lr;
 }
 
 #grid6 {
     /* Overlapping range. */
-    grid-definition-columns: 30px;
-    grid-definition-rows: minmax(10px, 180px) minmax(30px, 150px);
+    grid-template-columns: 30px;
+    grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
     -webkit-writing-mode: horizontal-bt;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
index 4114db3..d75f646 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
@@ -12,39 +12,39 @@ if (window.testRunner)
 }
 
 #grid1 {
-    grid-definition-columns: minmax(20px, 80px) 60px;
-    grid-definition-rows: 30px;
+    grid-template-columns: minmax(20px, 80px) 60px;
+    grid-template-rows: 30px;
 }
 
 #grid2 {
     /* First minmax more constraining than available logical width. */
-    grid-definition-columns: minmax(50%, 60px) minmax(10px, 40%);
-    grid-definition-rows: 30px;
+    grid-template-columns: minmax(50%, 60px) minmax(10px, 40%);
+    grid-template-rows: 30px;
 }
 
 #grid3 {
     /* Overlapping range. */
-    grid-definition-columns: minmax(10px, 80px) minmax(20px, 50px);
-    grid-definition-rows: 30px;
+    grid-template-columns: minmax(10px, 80px) minmax(20px, 50px);
+    grid-template-rows: 30px;
 }
 
 #grid4 {
-    grid-definition-columns: minmax(20px, 80px) 160px;
-    grid-definition-rows: 30px;
+    grid-template-columns: minmax(20px, 80px) 160px;
+    grid-template-rows: 30px;
     -webkit-writing-mode: vertical-rl;
 }
 
 #grid5 {
     /* 50% > 80px, 80px should be ignored. */
-    grid-definition-columns: minmax(50%, 80px) minmax(10px, 60%);
-    grid-definition-rows: 30px;
+    grid-template-columns: minmax(50%, 80px) minmax(10px, 60%);
+    grid-template-rows: 30px;
     -webkit-writing-mode: vertical-lr;
 }
 
 #grid6 {
     /* Overlapping range. */
-    grid-definition-columns: minmax(10px, 180px) minmax(30px, 150px);
-    grid-definition-rows: 30px;
+    grid-template-columns: minmax(10px, 180px) minmax(30px, 150px);
+    grid-template-rows: 30px;
     -webkit-writing-mode: horizontal-bt;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
index 99121b0..4b396fd 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
@@ -7,13 +7,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxContent {
-    grid-definition-columns: minmax(max-content, 50px);
-    grid-definition-rows: 60px;
+    grid-template-columns: minmax(max-content, 50px);
+    grid-template-rows: 60px;
 }
 
 .gridMaxMaxContent {
-    grid-definition-columns: minmax(30px, max-content);
-    grid-definition-rows: 20px;
+    grid-template-columns: minmax(30px, max-content);
+    grid-template-rows: 20px;
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
index a135caa..2813069 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
@@ -7,13 +7,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxContent {
-    grid-definition-columns: 20px;
-    grid-definition-rows: minmax(max-content, 50px);
+    grid-template-columns: 20px;
+    grid-template-rows: minmax(max-content, 50px);
 }
 
 .gridMaxMaxContent {
-    grid-definition-columns: 20px;
-    grid-definition-rows: minmax(30px, max-content);
+    grid-template-columns: 20px;
+    grid-template-rows: minmax(30px, max-content);
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
index a67e542..2ee16f2 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
@@ -7,13 +7,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMinContent {
-    grid-definition-columns: minmax(min-content, 40px);
-    grid-definition-rows: 50px;
+    grid-template-columns: minmax(min-content, 40px);
+    grid-template-rows: 50px;
 }
 
 .gridMaxMinContent {
-    grid-definition-columns: minmax(30px, min-content);
-    grid-definition-rows: 20px;
+    grid-template-columns: minmax(30px, min-content);
+    grid-template-rows: 20px;
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
index 4e3512f..0eccb0b 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
@@ -7,13 +7,13 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMinContent {
-    grid-definition-columns: 30px;
-    grid-definition-rows: minmax(min-content, 40px);
+    grid-template-columns: 30px;
+    grid-template-rows: minmax(min-content, 40px);
 }
 
 .gridMaxMinContent {
-    grid-definition-columns: 30px;
-    grid-definition-rows: minmax(30px, min-content);
+    grid-template-columns: 30px;
+    grid-template-rows: minmax(30px, min-content);
 }
 
 .firstRowFirstColumn {
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
index e1cde8b..c1ac64d9 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
@@ -7,23 +7,23 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoAutoContent {
-    grid-definition-columns: auto auto;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: auto auto;
+    grid-template-rows: 50px 100px;
 }
 
 .gridFixedAutoContent {
-    grid-definition-columns: 10px auto;
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: 10px auto;
+    grid-template-rows: 50px 100px;
 }
 
 .gridMinMaxMin {
-    grid-definition-columns: minmax(min-content, 50px) minmax(max-content, 140px);
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: minmax(min-content, 50px) minmax(max-content, 140px);
+    grid-template-rows: 50px 100px;
 }
 
 .gridMinMaxMax {
-    grid-definition-columns: minmax(50px, min-content) minmax(40px, max-content);
-    grid-definition-rows: 50px 100px;
+    grid-template-columns: minmax(50px, min-content) minmax(40px, max-content);
+    grid-template-rows: 50px 100px;
 }
 
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
index 17872e7..331ed48 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
@@ -7,23 +7,23 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoAutoContent {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: auto auto;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: auto auto;
 }
 
 .gridFixedAutoContent {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: 10px auto;
+    grid-template-columns: 50px 100px;
+    grid-template-rows: 10px auto;
 }
 
 .gridMinMaxMin {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: minmax(min-content, 50px) minmax(max-content, 140px);
+    grid-template-columns: 50px 100px;
+    grid-template-rows: minmax(min-content, 50px) minmax(max-content, 140px);
 }
 
 .gridMinMaxMax {
-    grid-definition-columns: 50px 100px;
-    grid-definition-rows: minmax(50px, min-content) minmax(40px, max-content);
+    grid-template-columns: 50px 100px;
+    grid-template-rows: minmax(50px, min-content) minmax(40px, max-content);
 }
 </style>
 <script src="../../resources/check-layout.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
index f45f6ec..e73d036 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt
@@ -1,111 +1,111 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
+Test that setting and getting grid-template-columns and grid-template-rows works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-columns') is "(first) 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-rows') is "(first) 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-columns') is "424px (last)"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-rows') is "162px (last)"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-definition-columns') is "0px (last)"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-definition-rows') is "0px (last)"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-definition-columns') is "77px (last)"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-definition-rows') is "22px (last)"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-columns') is "(first) 0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-rows') is "0px (last)"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-definition-columns') is "(first) 77px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-definition-rows') is "22px (last)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-definition-columns') is "(first) 80px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-definition-rows') is "300px (last)"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-definition-columns') is "(first nav) 10px (last)"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-definition-rows') is "(first nav) 15px (last)"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-definition-columns') is "(first nav) 80px (nav) 120px (last)"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-definition-rows') is "(first nav2) 150px (nav2) 450px (last)"
-PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-definition-columns') is "(first) 10px (nav nav2) 400px (nav nav2) 400px"
-PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-definition-rows') is "100px (nav nav2) 150px (nav nav2) 150px (last)"
-PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-definition-columns') is "10px"
-PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-definition-rows') is "20px 50px"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "(first) 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "(first) 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "424px (last)"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "162px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-columns') is "0px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getPropertyValue('grid-template-rows') is "0px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-columns') is "77px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '').getPropertyValue('grid-template-rows') is "22px (last)"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "(first) 0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "0px (last)"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-columns') is "(first) 77px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('grid-template-rows') is "22px (last)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "(first) 80px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "300px (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-columns') is "(first nav) 10px (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-rows') is "(first nav) 15px (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-columns') is "(first nav) 80px (nav) 120px (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-rows') is "(first nav2) 150px (nav2) 450px (last)"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-template-columns') is "(first) 10px (nav nav2) 400px (nav nav2) 400px"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-template-rows') is "100px (nav nav2) 150px (nav nav2) 150px (last)"
+PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-template-rows') is "20px 50px"
 
-Test getting and setting grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 18px"
-PASS element.style.gridDefinitionColumns is "(first) 18px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px (last)"
-PASS element.style.gridDefinitionRows is "66px (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 440px"
-PASS element.style.gridDefinitionColumns is "(first) 55%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "240px (last)"
-PASS element.style.gridDefinitionRows is "40% (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 0px"
-PASS element.style.gridDefinitionColumns is "(first) auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px (last)"
-PASS element.style.gridDefinitionRows is "auto (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 0px"
-PASS element.style.gridDefinitionColumns is "(first) min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px (last)"
-PASS element.style.gridDefinitionRows is "min-content (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 0px"
-PASS element.style.gridDefinitionColumns is "(first) max-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px (last)"
-PASS element.style.gridDefinitionRows is "max-content (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 440px"
-PASS element.style.gridDefinitionColumns is "(first) minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "240px (last)"
-PASS element.style.gridDefinitionRows is "minmax(30px, 40%) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 220px"
-PASS element.style.gridDefinitionColumns is "(first) minmax(22em, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "50px (last)"
-PASS element.style.gridDefinitionRows is "minmax(max-content, 5em) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 220px"
-PASS element.style.gridDefinitionColumns is "(first) minmax(22em, min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "50px (last)"
-PASS element.style.gridDefinitionRows is "minmax(min-content, 5em) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 0px"
-PASS element.style.gridDefinitionColumns is "(first) minmax(min-content, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "0px (last)"
-PASS element.style.gridDefinitionRows is "minmax(max-content, min-content) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first nav) 0px (last)"
-PASS element.style.gridDefinitionColumns is "(first nav) minmax(min-content, max-content) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "(first nav) 0px (last)"
-PASS element.style.gridDefinitionRows is "(first nav) minmax(max-content, min-content) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first nav) 0px (nav) 0px (last)"
-PASS element.style.gridDefinitionColumns is "(first nav) minmax(min-content, max-content) (nav) auto (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "(first nav2) 0px (nav2) 15px (last)"
-PASS element.style.gridDefinitionRows is "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(foo bar) 0px (foo) 0px (bar)"
-PASS element.style.gridDefinitionColumns is "(foo bar) auto (foo) auto (bar)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "(foo bar) 0px (foo) 0px (bar)"
-PASS element.style.gridDefinitionRows is "(foo bar) auto (foo) auto (bar)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 0px (foo bar) 20px (foo bar) 20px"
-PASS element.style.gridDefinitionColumns is "(first) auto (foo bar) 20px (foo bar) 20px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "220px (foo) 300px (baz)"
-PASS element.style.gridDefinitionRows is "220px (foo) 50% (baz)"
+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 18px"
+PASS element.style.gridTemplateColumns is "(first) 18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px (last)"
+PASS element.style.gridTemplateRows is "66px (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 440px"
+PASS element.style.gridTemplateColumns is "(first) 55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px (last)"
+PASS element.style.gridTemplateRows is "40% (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 0px"
+PASS element.style.gridTemplateColumns is "(first) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px (last)"
+PASS element.style.gridTemplateRows is "auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 0px"
+PASS element.style.gridTemplateColumns is "(first) min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px (last)"
+PASS element.style.gridTemplateRows is "min-content (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 0px"
+PASS element.style.gridTemplateColumns is "(first) max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px (last)"
+PASS element.style.gridTemplateRows is "max-content (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 440px"
+PASS element.style.gridTemplateColumns is "(first) minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px (last)"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 220px"
+PASS element.style.gridTemplateColumns is "(first) minmax(22em, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px (last)"
+PASS element.style.gridTemplateRows is "minmax(max-content, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 220px"
+PASS element.style.gridTemplateColumns is "(first) minmax(22em, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px (last)"
+PASS element.style.gridTemplateRows is "minmax(min-content, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 0px"
+PASS element.style.gridTemplateColumns is "(first) minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px (last)"
+PASS element.style.gridTemplateRows is "minmax(max-content, min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first nav) 0px (last)"
+PASS element.style.gridTemplateColumns is "(first nav) minmax(min-content, max-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(first nav) 0px (last)"
+PASS element.style.gridTemplateRows is "(first nav) minmax(max-content, min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first nav) 0px (nav) 0px (last)"
+PASS element.style.gridTemplateColumns is "(first nav) minmax(min-content, max-content) (nav) auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(first nav2) 0px (nav2) 15px (last)"
+PASS element.style.gridTemplateRows is "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(foo bar) 0px (foo) 0px (bar)"
+PASS element.style.gridTemplateColumns is "(foo bar) auto (foo) auto (bar)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(foo bar) 0px (foo) 0px (bar)"
+PASS element.style.gridTemplateRows is "(foo bar) auto (foo) auto (bar)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 0px (foo bar) 20px (foo bar) 20px"
+PASS element.style.gridTemplateColumns is "(first) auto (foo bar) 20px (foo bar) 20px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "220px (foo) 300px (baz)"
+PASS element.style.gridTemplateRows is "220px (foo) 50% (baz)"
 
-Test getting invalid grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithoutParentheses, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithoutParentheses, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithInvalidNestedParentheses, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithInvalidNestedParentheses, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithUnbalancedParentheses, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithUnbalancedParentheses, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithMisplacedParentheses, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithMisplacedParentheses, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithContiguousParentheses, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithContiguousParentheses, '').getPropertyValue('grid-definition-rows') is "none"
+Test getting invalid grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithoutParentheses, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithoutParentheses, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithInvalidNestedParentheses, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithInvalidNestedParentheses, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithUnbalancedParentheses, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithUnbalancedParentheses, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMisplacedParentheses, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithMisplacedParentheses, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithContiguousParentheses, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithContiguousParentheses, '').getPropertyValue('grid-template-rows') is "none"
 
-Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
+Test getting and setting invalid grid-template-columns and grid-template-rows through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
index 49ca288..b163ce7 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
@@ -15,56 +15,56 @@
     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 ();
 }
 .gridWithoutParentheses {
-    grid-definition-columns: first nav 10px;
-    grid-definition-rows: first 50% last;
+    grid-template-columns: first nav 10px;
+    grid-template-rows: first 50% last;
 }
 .gridWithInvalidNestedParentheses {
-    grid-definition-columns: (first (nav)) 10px (last);
-    grid-definition-rows: (first) 50% (last (nav) nav2);
+    grid-template-columns: (first (nav)) 10px (last);
+    grid-template-rows: (first) 50% (last (nav) nav2);
 }
 .gridWithUnbalancedParentheses {
-    grid-definition-columns: (first nav 10px;
-    grid-definition-rows: (first) 50% last);
+    grid-template-columns: (first nav 10px;
+    grid-template-rows: (first) 50% last);
 }
 .gridWithMisplacedParentheses {
-    grid-definition-columns: (first 10px) 50%;
-    grid-definition-rows: (first) (nav 50%);
+    grid-template-columns: (first 10px) 50%;
+    grid-template-rows: (first) (nav 50%);
 }
 .gridWithContiguousParentheses {
-    grid-definition-columns: (first) (nav) 10px;
-    grid-definition-rows: 50px (nav nav2) (middle) 10px;
+    grid-template-columns: (first) (nav) 10px;
+    grid-template-rows: 50px (nav nav2) (middle) 10px;
 }
 </style>
 <script src="../../resources/js-test.js"></script>
@@ -93,9 +93,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"), "424px (last)", "162px (last)");
     testGridDefinitionsValues(document.getElementById("gridWithPercentWithoutSize"), "0px (last)", "0px (last)");
@@ -109,7 +109,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");
     testGridDefinitionsSetJSValues("(first) 18px", "66px (last)", "(first) 18px", "66px (last)", "(first) 18px", "66px (last)");
     testGridDefinitionsSetJSValues("(first) 55%", "40% (last)", "(first) 440px", "240px (last)", "(first) 55%", "40% (last)");
     testGridDefinitionsSetJSValues("(first) auto", "auto (last)", "(first) 0px", "0px (last)", "(first) auto", "auto (last)");
@@ -125,7 +125,7 @@
     testGridDefinitionsSetJSValues("(first) auto repeat(2, (foo bar) 20px)", "220px (foo) repeat(1, 50% (baz)", "(first) 0px (foo bar) 20px (foo bar) 20px", "220px (foo) 300px (baz)", "(first) auto (foo bar) 20px (foo bar) 20px", "220px (foo) 50% (baz)");
 
     debug("");
-    debug("Test getting invalid grid-definition-columns and grid-definition-rows set through CSS");
+    debug("Test getting invalid grid-template-columns and grid-template-rows set through CSS");
     testGridDefinitionsValues(document.getElementById("gridWithoutParentheses"), "none", "none");
     testGridDefinitionsValues(document.getElementById("gridWithInvalidNestedParentheses"), "none", "none");
     testGridDefinitionsValues(document.getElementById("gridWithUnbalancedParentheses"), "none", "none");
@@ -133,7 +133,7 @@
     testGridDefinitionsValues(document.getElementById("gridWithContiguousParentheses"), "none", "none");
 
     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");
     testGridDefinitionsSetBadJSValues("(foo)", "(bar");
     testGridDefinitionsSetBadJSValues("(foo bar)", "(bar foo)");
     testGridDefinitionsSetBadJSValues("foo bar 10px", "50% baz bar foo 2em");
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
index 249157bf..dcff6cd 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt
@@ -1,153 +1,153 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
+Test that setting and getting grid-template-columns and grid-template-rows works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-columns') is "10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-columns') is "53%"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-rows') is "27%"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-rows') is "auto"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-columns') is "100px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-rows') is "150px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-definition-columns') is "64px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-definition-rows') is "60px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-definition-columns') is "minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-definition-rows') is "minmax(20px, 50%)"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-definition-columns') is "min-content"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-definition-rows') is "min-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-definition-columns') is "max-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-definition-rows') is "max-content"
-PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-definition-columns') is "1fr"
-PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-definition-rows') is "2fr"
-PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-definition-columns') is "150px"
-PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-definition-rows') is "75px"
-PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('grid-definition-columns') is "calc(50% + 150px)"
-PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('grid-definition-rows') is "calc(65% + 75px)"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-definition-columns') is "minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-definition-rows') is "minmax(20px, 50%)"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-definition-columns') is "minmax(10%, calc(50% + 15px))"
-PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-definition-rows') is "minmax(calc(20px + 10%), 50%)"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "53%"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "27%"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "auto"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-columns') is "64px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%)"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-columns') is "min-content"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-rows') is "min-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-columns') is "max-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-rows') is "max-content"
+PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-template-columns') is "1fr"
+PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-template-rows') is "2fr"
+PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-template-columns') is "150px"
+PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-template-rows') is "75px"
+PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('grid-template-columns') is "calc(50% + 150px)"
+PASS window.getComputedStyle(gridWithCalcComplex, '').getPropertyValue('grid-template-rows') is "calc(65% + 75px)"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%)"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, calc(50% + 15px))"
+PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(calc(20px + 10%), 50%)"
 
-Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-definition-rows') is "none"
+Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('grid-template-rows') is "none"
 
 Test the initial value
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 
-Test getting and setting grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px"
-PASS element.style.gridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px"
-PASS element.style.gridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "55%"
-PASS element.style.gridDefinitionColumns is "55%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "40%"
-PASS element.style.gridDefinitionRows is "40%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "auto"
-PASS element.style.gridDefinitionColumns is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "auto"
-PASS element.style.gridDefinitionRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "80px"
-PASS element.style.gridDefinitionColumns is "10vw"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "150px"
-PASS element.style.gridDefinitionRows is "25vh"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "min-content"
-PASS element.style.gridDefinitionColumns is "min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "min-content"
-PASS element.style.gridDefinitionRows is "min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "max-content"
-PASS element.style.gridDefinitionColumns is "max-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "max-content"
-PASS element.style.gridDefinitionRows is "max-content"
+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "55%"
+PASS element.style.gridTemplateColumns is "55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "40%"
+PASS element.style.gridTemplateRows is "40%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto"
+PASS element.style.gridTemplateColumns is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto"
+PASS element.style.gridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "80px"
+PASS element.style.gridTemplateColumns is "10vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "150px"
+PASS element.style.gridTemplateRows is "25vh"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "min-content"
+PASS element.style.gridTemplateColumns is "min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "min-content"
+PASS element.style.gridTemplateRows is "min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "max-content"
+PASS element.style.gridTemplateColumns is "max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "max-content"
+PASS element.style.gridTemplateRows is "max-content"
 
-Test getting and setting grid-definition-columns and grid-definition-rows to minmax() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(55%, 45px)"
-PASS element.style.gridDefinitionColumns is "minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(30px, 40%)"
-PASS element.style.gridDefinitionRows is "minmax(30px, 40%)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(220px, 48px)"
-PASS element.style.gridDefinitionColumns is "minmax(22em, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(80px, 50px)"
-PASS element.style.gridDefinitionRows is "minmax(10vw, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(min-content, 48px)"
-PASS element.style.gridDefinitionColumns is "minmax(min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(80px, min-content)"
-PASS element.style.gridDefinitionRows is "minmax(10vw, min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(220px, max-content)"
-PASS element.style.gridDefinitionColumns is "minmax(22em, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(max-content, 50px)"
-PASS element.style.gridDefinitionRows is "minmax(max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "minmax(min-content, max-content)"
-PASS element.style.gridDefinitionColumns is "minmax(min-content, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(max-content, min-content)"
-PASS element.style.gridDefinitionRows is "minmax(max-content, min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "3600fr"
-PASS element.style.gridDefinitionColumns is "3600fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "154fr"
-PASS element.style.gridDefinitionRows is "154fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "3.1459fr"
-PASS element.style.gridDefinitionColumns is "3.1459fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "2.718fr"
-PASS element.style.gridDefinitionRows is "2.718fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "3fr"
-PASS element.style.gridDefinitionColumns is "3fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "4fr"
-PASS element.style.gridDefinitionRows is "4fr"
+Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(55%, 45px)"
+PASS element.style.gridTemplateColumns is "minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(30px, 40%)"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(220px, 48px)"
+PASS element.style.gridTemplateColumns is "minmax(22em, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, 50px)"
+PASS element.style.gridTemplateRows is "minmax(10vw, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(min-content, 48px)"
+PASS element.style.gridTemplateColumns is "minmax(min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, min-content)"
+PASS element.style.gridTemplateRows is "minmax(10vw, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(220px, max-content)"
+PASS element.style.gridTemplateColumns is "minmax(22em, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, 50px)"
+PASS element.style.gridTemplateRows is "minmax(max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(min-content, max-content)"
+PASS element.style.gridTemplateColumns is "minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, min-content)"
+PASS element.style.gridTemplateRows is "minmax(max-content, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3600fr"
+PASS element.style.gridTemplateColumns is "3600fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "154fr"
+PASS element.style.gridTemplateRows is "154fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3.1459fr"
+PASS element.style.gridTemplateColumns is "3.1459fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "2.718fr"
+PASS element.style.gridTemplateRows is "2.718fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3fr"
+PASS element.style.gridTemplateColumns is "3fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "4fr"
+PASS element.style.gridTemplateRows is "4fr"
 
-Test setting grid-definition-columns and grid-definition-rows to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
+Test setting grid-template-columns and grid-template-rows to bad values through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
 
-Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px"
-PASS element.style.gridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px"
-PASS element.style.gridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS element.style.gridDefinitionColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS element.style.gridDefinitionRows is "none"
+Test setting grid-template-columns and grid-template-rows back to 'none' through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px"
+PASS element.style.gridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px"
+PASS element.style.gridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS element.style.gridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS element.style.gridTemplateRows is "none"
 
-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is '50px (last)'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is '(first) 101%'
+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '50px (last)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '(first) 101%'
 
-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is '150% (last)'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is '(first) 1fr'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is '150% (last)'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is '(first) 1fr'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
index c7fe66b..73d2404 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt
@@ -1,113 +1,113 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
+Test that setting and getting grid-template-columns and grid-template-rows works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting |grid-definition-columns| and |grid-definition-rows| set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-columns') is "7px 11px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-columns') is "53% 99%"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-rows') is "27% 52%"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-columns') is "auto auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-rows') is "auto auto"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-columns') is "100px 120px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-definition-rows') is "150px 170px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-definition-columns') is "15px auto 100px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-definition-rows') is "120px 18px auto"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-definition-columns') is "50% 120px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-definition-rows') is "35% 168px"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-definition-columns') is "min-content max-content"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-definition-rows') is "max-content min-content"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-definition-columns') is "minmax(45px, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-definition-rows') is "120px minmax(35%, 10px)"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-definition-columns') is "minmax(min-content, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-definition-rows') is "120px minmax(35%, max-content)"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-definition-columns') is "1fr 2fr"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-definition-rows') is "3fr 4fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-definition-columns') is "minmax(min-content, 45px) 2fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-definition-rows') is "3fr minmax(14px, max-content)"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-definition-columns') is "200px 100px"
-PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-definition-rows') is "150px 75px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-definition-columns') is "50% 80px"
-PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-definition-rows') is "88px 25%"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-definition-columns') is "calc(30px + 20%) minmax(min-content, 80px)"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-definition-rows') is "minmax(25%, max-content) calc(10% - 7px)"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-definition-columns') is "minmax(calc(23px + 10%), 400px) 120px"
-PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-definition-rows') is "150px minmax(5%, calc(50% - 125px))"
+Test getting |grid-template-columns| and |grid-template-rows| set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "7px 11px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "17px 2px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "53% 99%"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "27% 52%"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "auto auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "auto auto"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-columns') is "100px 120px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('grid-template-rows') is "150px 170px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-columns') is "15px auto 100px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('grid-template-rows') is "120px 18px auto"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-columns') is "50% 120px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-rows') is "35% 168px"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-columns') is "min-content max-content"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-rows') is "max-content min-content"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-columns') is "minmax(45px, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, 10px)"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-columns') is "minmax(min-content, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, max-content)"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-columns') is "1fr 2fr"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-rows') is "3fr 4fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-columns') is "minmax(min-content, 45px) 2fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-rows') is "3fr minmax(14px, max-content)"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-columns') is "200px 100px"
+PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-rows') is "150px 75px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-columns') is "50% 80px"
+PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-rows') is "88px 25%"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-columns') is "calc(30px + 20%) minmax(min-content, 80px)"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-rows') is "minmax(25%, max-content) calc(10% - 7px)"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(calc(23px + 10%), 400px) 120px"
+PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "150px minmax(5%, calc(50% - 125px))"
 
 Test the initial value
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 
-Test getting and setting grid-definition-rows and grid-definition-columns through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "18px 22px"
-PASS element.style.gridDefinitionColumns is "18px 22px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px 70px"
-PASS element.style.gridDefinitionRows is "66px 70px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "55% 80%"
-PASS element.style.gridDefinitionColumns is "55% 80%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "40% 63%"
-PASS element.style.gridDefinitionRows is "40% 63%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "auto auto"
-PASS element.style.gridDefinitionColumns is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "auto auto"
-PASS element.style.gridDefinitionRows is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "auto 160px 22px"
-PASS element.style.gridDefinitionColumns is "auto 16em 22px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "56% 100px auto"
-PASS element.style.gridDefinitionRows is "56% 10em auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "160px minmax(16px, 20px)"
-PASS element.style.gridDefinitionColumns is "16em minmax(16px, 20px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(10%, 15%) auto"
-PASS element.style.gridDefinitionRows is "minmax(10%, 15%) auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "160px 2fr"
-PASS element.style.gridDefinitionColumns is "16em 2fr"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "14fr auto"
-PASS element.style.gridDefinitionRows is "14fr auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "50% 96px"
-PASS element.style.gridDefinitionColumns is "50% 12vw"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "5% 510px"
-PASS element.style.gridDefinitionRows is "5% 85vh"
+Test getting and setting grid-template-rows and grid-template-columns through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "18px 22px"
+PASS element.style.gridTemplateColumns is "18px 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px 70px"
+PASS element.style.gridTemplateRows is "66px 70px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "55% 80%"
+PASS element.style.gridTemplateColumns is "55% 80%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "40% 63%"
+PASS element.style.gridTemplateRows is "40% 63%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto auto"
+PASS element.style.gridTemplateColumns is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto auto"
+PASS element.style.gridTemplateRows is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "auto 160px 22px"
+PASS element.style.gridTemplateColumns is "auto 16em 22px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "56% 100px auto"
+PASS element.style.gridTemplateRows is "56% 10em auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px minmax(16px, 20px)"
+PASS element.style.gridTemplateColumns is "16em minmax(16px, 20px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(10%, 15%) auto"
+PASS element.style.gridTemplateRows is "minmax(10%, 15%) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "160px 2fr"
+PASS element.style.gridTemplateColumns is "16em 2fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "14fr auto"
+PASS element.style.gridTemplateRows is "14fr auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50% 96px"
+PASS element.style.gridTemplateColumns is "50% 12vw"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "5% 510px"
+PASS element.style.gridTemplateRows is "5% 85vh"
 
 Test getting wrong values set from CSS
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-rows') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows') is 'none'
 
 Test setting and getting wrong values from JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
 
-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "50px 1fr (last)"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "101% (middle) 45px"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "50px 1fr (last)"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "101% (middle) 45px"
+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 1fr (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "101% (middle) 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "50px 1fr (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "101% (middle) 45px"
 
-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "150% (middle) 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "1fr (line) 2fr (line)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is 'none'
+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "150% (middle) 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "1fr (line) 2fr (line)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is 'none'
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
index 275d859d..268f9a4 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
@@ -4,83 +4,83 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridWithFixed {
-    grid-definition-columns: 7px 11px;
-    grid-definition-rows: 17px 2px;
+    grid-template-columns: 7px 11px;
+    grid-template-rows: 17px 2px;
 }
 
 .gridWithPercent {
-    grid-definition-columns: 53% 99%;
-    grid-definition-rows: 27% 52%;
+    grid-template-columns: 53% 99%;
+    grid-template-rows: 27% 52%;
 }
 .gridWithAuto {
-    grid-definition-columns: auto auto;
-    grid-definition-rows: auto auto;
+    grid-template-columns: auto auto;
+    grid-template-rows: auto auto;
 }
 .gridWithEM {
-    grid-definition-columns: 10em 12em;
-    grid-definition-rows: 15em 17em;
+    grid-template-columns: 10em 12em;
+    grid-template-rows: 15em 17em;
     font: 10px Ahem;
 }
 .gridWithNoneAndAuto {
-    grid-definition-columns: none auto;
-    grid-definition-rows: none auto;
+    grid-template-columns: none auto;
+    grid-template-rows: none auto;
 }
 .gridNoneWithAndFixed {
-    grid-definition-columns: none 15px;
-    grid-definition-rows: none 22px;
+    grid-template-columns: none 15px;
+    grid-template-rows: none 22px;
 }
 .gridWithThreeItems {
-    grid-definition-columns: 15px auto 10em;
-    grid-definition-rows: 12em 18px auto;
+    grid-template-columns: 15px auto 10em;
+    grid-template-rows: 12em 18px auto;
     font: 10px Ahem;
 }
 .gridWithPercentAndViewportPercent {
-    grid-definition-columns: 50% 15vw;
-    grid-definition-rows: 35% 28vh;
+    grid-template-columns: 50% 15vw;
+    grid-template-rows: 35% 28vh;
 }
 .gridWithFitContentAndFitAvailable {
-    grid-definition-columns: -webkit-content-available;
-    grid-definition-rows: -webkit-fit-content -webkit-fit-available;
+    grid-template-columns: -webkit-content-available;
+    grid-template-rows: -webkit-fit-content -webkit-fit-available;
 }
 .gridWithMinMaxContent {
-    grid-definition-columns: min-content max-content;
-    grid-definition-rows: max-content min-content;
+    grid-template-columns: min-content max-content;
+    grid-template-rows: max-content min-content;
 }
 .gridWithMinMaxAndFixed {
-    grid-definition-columns: minmax(45px, 30%) 15px;
-    grid-definition-rows: 12em minmax(35%, 10px);
+    grid-template-columns: minmax(45px, 30%) 15px;
+    grid-template-rows: 12em minmax(35%, 10px);
     font: 10px Ahem;
 }
 .gridWithMinMaxAndMinMaxContent {
-    grid-definition-columns: minmax(min-content, 30%) 15px;
-    grid-definition-rows: 12em minmax(35%, max-content);
+    grid-template-columns: minmax(min-content, 30%) 15px;
+    grid-template-rows: 12em minmax(35%, max-content);
     font: 10px Ahem;
 }
 .gridWithFractionFraction {
-    grid-definition-columns: 1fr 2fr;
-    grid-definition-rows: 3fr 4fr;
+    grid-template-columns: 1fr 2fr;
+    grid-template-rows: 3fr 4fr;
 }
 .gridWithFractionMinMax {
-    grid-definition-columns: minmax(min-content, 45px) 2fr;
-    grid-definition-rows: 3fr minmax(14px, max-content);
+    grid-template-columns: minmax(min-content, 45px) 2fr;
+    grid-template-rows: 3fr minmax(14px, max-content);
 }
 .gridWithCalcCalc {
-    grid-definition-columns: calc(200px) calc(10em);
-    grid-definition-rows: calc(15em) calc(75px);
+    grid-template-columns: calc(200px) calc(10em);
+    grid-template-rows: calc(15em) calc(75px);
     font: 10px Ahem;
 }
 .gridWithCalcAndFixed {
-    grid-definition-columns: calc(50%) 8em;
-    grid-definition-rows: 88px calc(25%);
+    grid-template-columns: calc(50%) 8em;
+    grid-template-rows: 88px calc(25%);
     font: 10px Ahem;
 }
 .gridWithCalcAndMinMax {
-    grid-definition-columns: calc(30px + 20%) minmax(min-content, 80px);
-    grid-definition-rows: minmax(25%, max-content) calc(10% - 7px);
+    grid-template-columns: calc(30px + 20%) minmax(min-content, 80px);
+    grid-template-rows: minmax(25%, max-content) calc(10% - 7px);
 }
 .gridWithCalcInsideMinMax {
-    grid-definition-columns: minmax(calc(23px + 10%), 400px) 12em;
-    grid-definition-rows: calc(150px) minmax(5%, calc(50% - 125px));
+    grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
+    grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px));
     font: 10px Ahem;
 }
 </style>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
index b83602f..939f3cd 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
@@ -4,69 +4,69 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridWithNone {
-    grid-definition-columns: none;
-    grid-definition-rows: none;
+    grid-template-columns: none;
+    grid-template-rows: none;
 }
 .gridWithFixed {
-    grid-definition-columns: 10px;
-    grid-definition-rows: 15px;
+    grid-template-columns: 10px;
+    grid-template-rows: 15px;
 }
 .gridWithPercent {
-    grid-definition-columns: 53%;
-    grid-definition-rows: 27%;
+    grid-template-columns: 53%;
+    grid-template-rows: 27%;
 }
 .gridWithAuto {
-    grid-definition-columns: auto;
-    grid-definition-rows: auto;
+    grid-template-columns: auto;
+    grid-template-rows: auto;
 }
 .gridWithEM {
-    grid-definition-columns: 10em;
-    grid-definition-rows: 15em;
+    grid-template-columns: 10em;
+    grid-template-rows: 15em;
     font: 10px Ahem;
 }
 .gridWithViewPortPercentage {
-    grid-definition-columns: 8vw;
-    grid-definition-rows: 10vh;
+    grid-template-columns: 8vw;
+    grid-template-rows: 10vh;
 }
 .gridWithFitContent {
-    grid-definition-columns: -webkit-fit-content;
-    grid-definition-rows: -webkit-fit-content;
+    grid-template-columns: -webkit-fit-content;
+    grid-template-rows: -webkit-fit-content;
 }
 .gridWithFitAvailable {
-    grid-definition-columns: -webkit-fit-available;
-    grid-definition-rows: -webkit-fit-available;
+    grid-template-columns: -webkit-fit-available;
+    grid-template-rows: -webkit-fit-available;
 }
 .gridWithMinMax {
-    grid-definition-columns: minmax(10%, 15px);
-    grid-definition-rows: minmax(20px, 50%);
+    grid-template-columns: minmax(10%, 15px);
+    grid-template-rows: minmax(20px, 50%);
 }
 .gridWithMinContent {
-    grid-definition-columns: min-content;
-    grid-definition-rows: min-content;
+    grid-template-columns: min-content;
+    grid-template-rows: min-content;
 }
 .gridWithMaxContent {
-    grid-definition-columns: max-content;
-    grid-definition-rows: max-content;
+    grid-template-columns: max-content;
+    grid-template-rows: max-content;
 }
 .gridWithFraction {
-    grid-definition-columns: 1fr;
-    grid-definition-rows: 2fr;
+    grid-template-columns: 1fr;
+    grid-template-rows: 2fr;
 }
 .gridWithCalc {
-    grid-definition-columns: calc(150px);
-    grid-definition-rows: calc(75px);
+    grid-template-columns: calc(150px);
+    grid-template-rows: calc(75px);
 }
 .gridWithCalcComplex {
-    grid-definition-columns: calc(50% + 150px);
-    grid-definition-rows: calc(65% + 75px);
+    grid-template-columns: calc(50% + 150px);
+    grid-template-rows: calc(65% + 75px);
 }
 .gridWithCalcInsideMinMax {
-    grid-definition-columns: minmax(10%, calc(15px));
-    grid-definition-rows: minmax(calc(20px), 50%);
+    grid-template-columns: minmax(10%, calc(15px));
+    grid-template-rows: minmax(calc(20px), 50%);
 }
 .gridWithCalcComplexInsideMinMax {
-    grid-definition-columns: minmax(10%, calc(50% + 15px));
-    grid-definition-rows: minmax(calc(20px + 10%), 50%);
+    grid-template-columns: minmax(10%, calc(50% + 15px));
+    grid-template-rows: minmax(calc(20px + 10%), 50%);
 }
 </style>
 <script src="../../resources/js-test.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
index 62251a6..f6f9cfb 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt
@@ -1,36 +1,36 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected
+Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('grid-definition-columns') is "15%"
-PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('grid-definition-rows') is "18px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-definition-columns') is "minmax(15px, 50%) minmax(15px, 50%)"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-definition-rows') is "auto auto"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-definition-columns') is "auto minmax(100px, 120px) auto minmax(100px, 120px)"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-definition-rows') is "minmax(5px, 10px) auto minmax(5px, 10px) auto"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "auto (middle) 250px (end) auto (middle) 250px (end)"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "10px (start) auto (end) 10px (start) auto (end)"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "(before) auto (before) auto"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "(before) 10px (before) 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "250px (end)"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "10px (end)"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-definition-columns') is "(start) 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-definition-rows') is "(start) 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-definition-columns') is "(start) 140px 250px 250px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-definition-rows') is "auto 10px 10px"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-definition-columns') is "250px 250px 15% (last)"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-definition-rows') is "10px 10px (end) auto"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('grid-template-columns') is "15%"
+PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('grid-template-rows') is "18px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-columns') is "minmax(15px, 50%) minmax(15px, 50%)"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('grid-template-rows') is "auto auto"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-columns') is "auto minmax(100px, 120px) auto minmax(100px, 120px)"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('grid-template-rows') is "minmax(5px, 10px) auto minmax(5px, 10px) auto"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "auto (middle) 250px (end) auto (middle) 250px (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px (start) auto (end) 10px (start) auto (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "(before) auto (before) auto"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "(before) 10px (before) 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "250px (end)"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "10px (end)"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-columns') is "(start) 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('grid-template-rows') is "(start) 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-columns') is "(start) 140px 250px 250px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('grid-template-rows') is "auto 10px 10px"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-columns') is "250px 250px 15% (last)"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('grid-template-rows') is "10px 10px (end) auto"
 
 Test invalid repeat syntax.
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
index 2373bd8..7e23dfa 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
@@ -4,48 +4,48 @@
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .singleSingleTrackRepeat {
-    grid-definition-rows: repeat(1, 18px);
-    grid-definition-columns: repeat(1, 15%);
+    grid-template-rows: repeat(1, 18px);
+    grid-template-columns: repeat(1, 15%);
 }
 
 .twoSingleTrackRepeat {
-    grid-definition-rows: repeat(2, auto);
-    grid-definition-columns: repeat(2, minmax(15px, 50%));
+    grid-template-rows: repeat(2, auto);
+    grid-template-columns: repeat(2, minmax(15px, 50%));
 }
 
 .twoDoubleTrackRepeat {
-    grid-definition-rows: repeat(2, minmax(5px, 10px)  auto);
-    grid-definition-columns: repeat(2, auto minmax(100px, 120px));
+    grid-template-rows: repeat(2, minmax(5px, 10px)  auto);
+    grid-template-columns: repeat(2, auto minmax(100px, 120px));
 }
 
 .twoDoubleTrackWithNamedGridLineRepeat {
-    grid-definition-rows: repeat(2, 10px (start) auto (end));
-    grid-definition-columns: repeat(2, auto (middle) 250px (end));
+    grid-template-rows: repeat(2, 10px (start) auto (end));
+    grid-template-columns: repeat(2, auto (middle) 250px (end));
 }
 
 .twoDoubleTrackWithTrailingNamedGridLineRepeat {
-    grid-definition-rows: repeat(2, (before) 10px);
-    grid-definition-columns: repeat(2, (before) auto);
+    grid-template-rows: repeat(2, (before) 10px);
+    grid-template-columns: repeat(2, (before) auto);
 }
 
 .trailingNamedGridLineRepeat {
-    grid-definition-rows: repeat(1, 10px) (end);
-    grid-definition-columns: repeat(1, 250px) (end);
+    grid-template-rows: repeat(1, 10px) (end);
+    grid-template-columns: repeat(1, 250px) (end);
 }
 
 .leadingNamedGridLineRepeat {
-    grid-definition-rows: (start) repeat(2, 10px);
-    grid-definition-columns: (start) repeat(2, 250px);
+    grid-template-rows: (start) repeat(2, 10px);
+    grid-template-columns: (start) repeat(2, 250px);
 }
 
 .mixRepeatAfterNonRepeat {
-    grid-definition-rows: auto repeat(2, 10px);
-    grid-definition-columns: (start) 140px repeat(2, 250px);
+    grid-template-rows: auto repeat(2, 10px);
+    grid-template-columns: (start) 140px repeat(2, 250px);
 }
 
 .mixNonRepeatAfterRepeat {
-    grid-definition-rows: repeat(2, 10px) (end) auto;
-    grid-definition-columns: repeat(2, 250px) 15% (last);
+    grid-template-rows: repeat(2, 10px) (end) auto;
+    grid-template-columns: repeat(2, 250px) 15% (last);
 }
 </style>
 <script src="../../resources/js-test.js"></script>
@@ -63,9 +63,9 @@
 
 <script src="resources/grid-definitions-parsing-utils.js"></script>
 <script>
-    description('Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected');
+    description('Test that setting and getting grid-template-columns and grid-template-rows with repeat() 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("singleSingleTrackRepeat"), "15%", "18px");
     testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "minmax(15px, 50%) minmax(15px, 50%)", "auto auto");
     testGridDefinitionsValues(document.getElementById("twoDoubleTrackRepeat"), "auto minmax(100px, 120px) auto minmax(100px, 120px)", "minmax(5px, 10px) auto minmax(5px, 10px) auto");
@@ -81,8 +81,8 @@
     function testInvalidSyntax(gridColumn) {
         element = document.createElement("div");
         document.body.appendChild(element);
-        element.style.gridDefinitionColumns = gridColumn;
-        shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "none");
+        element.style.gridTemplateColumns = gridColumn;
+        shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
         document.body.removeChild(element);
     }
     testInvalidSyntax("repeat(");
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
index 6c56090..aeec8e6 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt
@@ -1,81 +1,81 @@
-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
+Test that setting and getting grid-template-columns and grid-template-rows works as expected
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-columns') is "(first) 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-definition-rows') is "(first) 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-columns') is "53% (last)"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-definition-rows') is "27% (last)"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-columns') is "(first) auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-definition-rows') is "auto (last)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-definition-columns') is "(first) minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-definition-rows') is "minmax(20px, 50%) (last)"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-definition-columns') is "(first nav) 10px (last)"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-definition-rows') is "(first nav) 15px (last)"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-definition-columns') is "(first nav) 10% (nav) 15% (last)"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-definition-rows') is "(first nav2) 25% (nav2) 75% (last)"
-PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-definition-columns') is "(first) 10px (nav nav2) 50% (nav nav2) 50%"
-PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-definition-rows') is "100px (nav nav2) 25% (nav nav2) 25% (last)"
-PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-definition-columns') is "10px"
-PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-definition-rows') is "20px 50px"
+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-columns') is "(first) 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('grid-template-rows') is "(first) 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-columns') is "53% (last)"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('grid-template-rows') is "27% (last)"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-columns') is "(first) auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('grid-template-rows') is "auto (last)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "(first) minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%) (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-columns') is "(first nav) 10px (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('grid-template-rows') is "(first nav) 15px (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-columns') is "(first nav) 10% (nav) 15% (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('grid-template-rows') is "(first nav2) 25% (nav2) 75% (last)"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-template-columns') is "(first) 10px (nav nav2) 50% (nav nav2) 50%"
+PASS window.getComputedStyle(gridWithRepeatElement, '').getPropertyValue('grid-template-rows') is "100px (nav nav2) 25% (nav nav2) 25% (last)"
+PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithEmptyParentheses, '').getPropertyValue('grid-template-rows') is "20px 50px"
 
-Test getting and setting grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 18px"
-PASS element.style.gridDefinitionColumns is "(first) 18px"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "66px (last)"
-PASS element.style.gridDefinitionRows is "66px (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) 55%"
-PASS element.style.gridDefinitionColumns is "(first) 55%"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "40% (last)"
-PASS element.style.gridDefinitionRows is "40% (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) auto"
-PASS element.style.gridDefinitionColumns is "(first) auto"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "auto (last)"
-PASS element.style.gridDefinitionRows is "auto (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) min-content"
-PASS element.style.gridDefinitionColumns is "(first) min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "min-content (last)"
-PASS element.style.gridDefinitionRows is "min-content (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) max-content"
-PASS element.style.gridDefinitionColumns is "(first) max-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "max-content (last)"
-PASS element.style.gridDefinitionRows is "max-content (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) minmax(55%, 45px)"
-PASS element.style.gridDefinitionColumns is "(first) minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(30px, 40%) (last)"
-PASS element.style.gridDefinitionRows is "minmax(30px, 40%) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) minmax(220px, max-content)"
-PASS element.style.gridDefinitionColumns is "(first) minmax(22em, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(max-content, 50px) (last)"
-PASS element.style.gridDefinitionRows is "minmax(max-content, 5em) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) minmax(220px, min-content)"
-PASS element.style.gridDefinitionColumns is "(first) minmax(22em, min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(min-content, 50px) (last)"
-PASS element.style.gridDefinitionRows is "minmax(min-content, 5em) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first) minmax(min-content, max-content)"
-PASS element.style.gridDefinitionColumns is "(first) minmax(min-content, max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "minmax(max-content, min-content) (last)"
-PASS element.style.gridDefinitionRows is "minmax(max-content, min-content) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first nav) minmax(min-content, max-content) (last)"
-PASS element.style.gridDefinitionColumns is "(first nav) minmax(min-content, max-content) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "(first nav) minmax(max-content, min-content) (last)"
-PASS element.style.gridDefinitionRows is "(first nav) minmax(max-content, min-content) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(first nav) minmax(min-content, max-content) (nav) auto (last)"
-PASS element.style.gridDefinitionColumns is "(first nav) minmax(min-content, max-content) (nav) auto (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)"
-PASS element.style.gridDefinitionRows is "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "(foo bar) auto (foo) auto (bar)"
-PASS element.style.gridDefinitionColumns is "(foo bar) auto (foo) auto (bar)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "(foo bar) auto (foo) auto (bar)"
-PASS element.style.gridDefinitionRows is "(foo bar) auto (foo) auto (bar)"
+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 18px"
+PASS element.style.gridTemplateColumns is "(first) 18px"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "66px (last)"
+PASS element.style.gridTemplateRows is "66px (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) 55%"
+PASS element.style.gridTemplateColumns is "(first) 55%"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "40% (last)"
+PASS element.style.gridTemplateRows is "40% (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) auto"
+PASS element.style.gridTemplateColumns is "(first) auto"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto (last)"
+PASS element.style.gridTemplateRows is "auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) min-content"
+PASS element.style.gridTemplateColumns is "(first) min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "min-content (last)"
+PASS element.style.gridTemplateRows is "min-content (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) max-content"
+PASS element.style.gridTemplateColumns is "(first) max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "max-content (last)"
+PASS element.style.gridTemplateRows is "max-content (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) minmax(55%, 45px)"
+PASS element.style.gridTemplateColumns is "(first) minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(30px, 40%) (last)"
+PASS element.style.gridTemplateRows is "minmax(30px, 40%) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) minmax(220px, max-content)"
+PASS element.style.gridTemplateColumns is "(first) minmax(22em, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, 50px) (last)"
+PASS element.style.gridTemplateRows is "minmax(max-content, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) minmax(220px, min-content)"
+PASS element.style.gridTemplateColumns is "(first) minmax(22em, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(min-content, 50px) (last)"
+PASS element.style.gridTemplateRows is "minmax(min-content, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first) minmax(min-content, max-content)"
+PASS element.style.gridTemplateColumns is "(first) minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, min-content) (last)"
+PASS element.style.gridTemplateRows is "minmax(max-content, min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first nav) minmax(min-content, max-content) (last)"
+PASS element.style.gridTemplateColumns is "(first nav) minmax(min-content, max-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(first nav) minmax(max-content, min-content) (last)"
+PASS element.style.gridTemplateRows is "(first nav) minmax(max-content, min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(first nav) minmax(min-content, max-content) (nav) auto (last)"
+PASS element.style.gridTemplateColumns is "(first nav) minmax(min-content, max-content) (nav) auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)"
+PASS element.style.gridTemplateRows is "(first nav2) minmax(max-content, min-content) (nav2) minmax(10px, 15px) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "(foo bar) auto (foo) auto (bar)"
+PASS element.style.gridTemplateColumns is "(foo bar) auto (foo) auto (bar)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "(foo bar) auto (foo) auto (bar)"
+PASS element.style.gridTemplateRows is "(foo bar) auto (foo) auto (bar)"
 
-Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-columns') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('grid-definition-rows') is "none"
+Test getting and setting invalid grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "none"
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
index adba071d..c9aa5c2 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
+++ b/third_party/WebKit/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>
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
index f4c4c6c..5744913 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
@@ -13,8 +13,8 @@ if (window.testRunner)
 }
 
 .grid {
-    grid-definition-columns: 40% 60%;
-    grid-definition-rows: 30% 70%;
+    grid-template-columns: 40% 60%;
+    grid-template-rows: 30% 70%;
     width: 80%;
     height: 50%;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
index a53549f..81c2375 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 70% 30%;
-    grid-definition-rows: 40% 60%;
+    grid-template-columns: 70% 30%;
+    grid-template-rows: 40% 60%;
     width: 400px;
     height: 300px;
 }
@@ -41,12 +41,12 @@ function changeGridDefinitionsAndCheckValues()
     var grid1 = document.getElementsByClassName("grid")[1];
     var grid2 = document.getElementsByClassName("grid")[2];
     document.body.offsetLeft;
-    grid0.style.gridDefinitionColumns = "40% 60%";
+    grid0.style.gridTemplateColumns = "40% 60%";
 
-    grid1.style.gridDefinitionRows = "30% 70%";
+    grid1.style.gridTemplateRows = "30% 70%";
 
-    grid2.style.gridDefinitionColumns = "40% 60%";
-    grid2.style.gridDefinitionRows = "30% 70%";
+    grid2.style.gridTemplateColumns = "40% 60%";
+    grid2.style.gridTemplateRows = "30% 70%";
 
     checkLayout('.grid');
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
index 6c2dad6..dfbc6cd 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 40% 60%;
-    grid-definition-rows: 30% 70%;
+    grid-template-columns: 40% 60%;
+    grid-template-rows: 30% 70%;
     width: 400px;
     height: 300px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
index 8ea465a..aba5f79 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 200px 200px;
-    grid-definition-rows: 100px 100px;
+    grid-template-columns: 200px 200px;
+    grid-template-rows: 100px 100px;
     height: 200px;
     width: 400px;
 }
@@ -38,8 +38,8 @@ function changeGridTrackSizesAndCheckLayout()
 {
     var grid = document.getElementsByClassName("grid")[0];
     grid.offsetLeft;
-    grid.style.gridDefinitionColumns = "100px 300px";
-    grid.style.gridDefinitionRows = "50px 150px";
+    grid.style.gridTemplateColumns = "100px 300px";
+    grid.style.gridTemplateRows = "50px 150px";
     checkLayout('.grid');
 }
 window.addEventListener("load", changeGridTrackSizesAndCheckLayout, false);
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
index 58ad361..0a79445 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 100px 300px;
-    grid-definition-rows: 50px 150px;
+    grid-template-columns: 100px 300px;
+    grid-template-rows: 50px 150px;
     height: 200px;
     width: 400px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
index 59995b0..37fc955 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 100px 300px;
-    grid-definition-rows: 50px 150px;
+    grid-template-columns: 100px 300px;
+    grid-template-rows: 50px 150px;
     height: 200px;
     width: 400px;
 }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/place-cell-by-index.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
index 3ef0b6a..2dfd29e 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
@@ -7,8 +7,8 @@ if (window.testRunner)
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
-    grid-definition-columns: 50px 60px;
-    grid-definition-rows: 20px 30px;
+    grid-template-columns: 50px 60px;
+    grid-template-rows: 20px 30px;
     max-width: 110px;
 }
 
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
index c3e8eca..194a236 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
@@ -1,6 +1,6 @@
-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"), "7px 11px", "17px 2px");
 testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%", "424px 792px", "162px 312px");
 testGridDefinitionsValues(document.getElementById("gridWithPercentWithoutSize"), "53% 99%", "27% 52%", "7px 0px", "11px 0px");
@@ -24,11 +24,11 @@ debug("");
 debug("Test the initial value");
 var element = document.createElement("div");
 document.body.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
 debug("");
-debug("Test getting and setting grid-definition-rows and grid-definition-columns through JS");
+debug("Test getting and setting grid-template-rows and grid-template-columns through JS");
 testGridDefinitionsSetJSValues("18px 22px", "66px 70px");
 testGridDefinitionsSetJSValues("55% 80%", "40% 63%", "440px 640px", "240px 378px");
 testGridDefinitionsSetJSValues("auto auto", "auto auto", "0px 0px", "0px 0px");
@@ -42,12 +42,12 @@ testGridDefinitionsSetJSValues("calc(25px + 40%) minmax(min-content, calc(10% +
 debug("");
 debug("Test getting wrong values set from CSS");
 var gridWithNoneAndAuto = document.getElementById("gridWithNoneAndAuto");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows')", "'none'");
 
 var gridWithNoneAndFixed = document.getElementById("gridWithNoneAndFixed");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows')", "'none'");
 
 debug("");
 debug("Test setting and getting wrong values from JS");
@@ -73,21 +73,21 @@ function testInherit()
     parentElement.style.width = "800px";
     parentElement.style.height = "600px";
     parentElement.style.font = "10px Ahem"; // Used to resolve em font consistently.
-    parentElement.style.gridDefinitionColumns = "50px 1fr (last)";
-    parentElement.style.gridDefinitionRows = "2em (middle) 45px";
+    parentElement.style.gridTemplateColumns = "50px 1fr (last)";
+    parentElement.style.gridTemplateRows = "2em (middle) 45px";
     testGridDefinitionsValues(parentElement, "50px 750px (last)", "20px (middle) 45px");
 
     element = document.createElement("div");
     parentElement.appendChild(element);
     element.style.display = "grid";
-    element.style.gridDefinitionColumns = "inherit";
-    element.style.gridDefinitionRows = "inherit";
+    element.style.gridTemplateColumns = "inherit";
+    element.style.gridTemplateRows = "inherit";
     testGridDefinitionsValues(element, "50px 0px (last)", "20px (middle) 45px");
 
     document.body.removeChild(parentElement);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
 testInherit();
 
 function testInitial()
@@ -97,17 +97,17 @@ function testInitial()
     element.style.display = "grid";
     element.style.width = "800px";
     element.style.height = "600px";
-    element.style.gridDefinitionColumns = "150% (middle) 55px";
-    element.style.gridDefinitionRows = "1fr (line) 2fr (line)";
+    element.style.gridTemplateColumns = "150% (middle) 55px";
+    element.style.gridTemplateRows = "1fr (line) 2fr (line)";
     testGridDefinitionsValues(element, "1200px (middle) 55px", "200px (line) 400px (line)");
 
-    element.style.gridDefinitionColumns = "initial";
-    element.style.gridDefinitionRows = "initial";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+    element.style.gridTemplateColumns = "initial";
+    element.style.gridTemplateRows = "initial";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
     document.body.removeChild(element);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
 testInitial();
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
index b8d9e5b8..c290220 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
@@ -1,6 +1,6 @@
-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("gridWithNoneElement"), "none", "none");
 testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
 testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "400px", "150px");
@@ -23,7 +23,7 @@ testGridDefinitionsValues(document.getElementById("gridWithCalcInsideMinMaxEleme
 testGridDefinitionsValues(document.getElementById("gridWithCalcComplexInsideMinMaxElement"), "minmax(10%, 415px)", "minmax(80px, 50%)", "415px", "300px");
 
 debug("");
-debug("Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none')");
+debug("Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')");
 var gridWithFitContentElement = document.getElementById("gridWithFitContentElement");
 testGridDefinitionsValues(gridWithFitContentElement, "none", "none");
 
@@ -35,11 +35,11 @@ debug("Test the initial value");
 var element = document.createElement("div");
 document.body.appendChild(element);
 testGridDefinitionsValues(element, "none", "none");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
 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");
 testGridDefinitionsSetJSValues("18px", "66px");
 testGridDefinitionsSetJSValues("55%", "40%", "440px", "240px");
 testGridDefinitionsSetJSValues("auto", "auto", "0px", "0px");
@@ -48,7 +48,7 @@ testGridDefinitionsSetJSValues("min-content", "min-content", "0px", "0px");
 testGridDefinitionsSetJSValues("max-content", "max-content", "0px", "0px");
 
 debug("");
-debug("Test getting and setting grid-definition-columns and grid-definition-rows to minmax() values through JS");
+debug("Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS");
 testGridDefinitionsSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)", "440px", "240px");
 testGridDefinitionsSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "220px", "80px");
 testGridDefinitionsSetJSValues("minmax(min-content, 8vh)", "minmax(10vw, min-content)", "48px", "80px");
@@ -62,14 +62,14 @@ testGridDefinitionsSetJSValues("3.1459fr", "2.718fr", "800px", "600px");
 testGridDefinitionsSetJSValues("+3fr", "+4fr", "800px", "600px", "3fr", "4fr");
 
 debug("");
-debug("Test getting and setting grid-definition-columns and grid-definition-rows to calc() values through JS");
+debug("Test getting and setting grid-template-columns and grid-template-rows to calc() values through JS");
 testGridDefinitionsSetJSValues("calc(150px)", "calc(75px)", "150px", "75px");
 testGridDefinitionsSetJSValues("calc(50% - 30px)", "calc(75px + 10%)", "370px", "135px");
 testGridDefinitionsSetJSValues("minmax(25%, calc(30px))", "minmax(calc(75%), 40px)", "200px", "450px", "minmax(25%, calc(30px))", "minmax(calc(75%), 40px)");
 testGridDefinitionsSetJSValues("minmax(10%, calc(30px + 10%))", "minmax(calc(25% - 50px), 200px)", "110px", "200px", "minmax(10%, calc(30px + 10%))", "minmax(calc(25% - 50px), 200px)");
 
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to bad values through JS");
+debug("Test setting grid-template-columns and grid-template-rows to bad values through JS");
 // No comma and only 1 argument provided.
 testGridDefinitionsSetBadJSValues("minmax(10px 20px)", "minmax(10px)")
 // Nested minmax and only 2 arguments are allowed.
@@ -92,7 +92,7 @@ testGridDefinitionsSetBadJSValues("calc(16px 30px)", "calc(25px + auto)");
 testGridDefinitionsSetBadJSValues("minmax(min-content, calc())", "calc(10%(");
 
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS");
+debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
 testGridDefinitionsSetJSValues("18px", "66px");
 testGridDefinitionsSetJSValues("none", "none");
 
@@ -100,22 +100,22 @@ function testInherit()
 {
     var parentElement = document.createElement("div");
     document.body.appendChild(parentElement);
-    parentElement.style.gridDefinitionColumns = "50px (last)";
-    parentElement.style.gridDefinitionRows = "(first) 101%";
+    parentElement.style.gridTemplateColumns = "50px (last)";
+    parentElement.style.gridTemplateRows = "(first) 101%";
 
     element = document.createElement("div");
     parentElement.appendChild(element);
     element.style.display = "grid";
     element.style.height = "100px";
-    element.style.gridDefinitionColumns = "inherit";
-    element.style.gridDefinitionRows = "inherit";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'50px (last)'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'(first) 101px'");
+    element.style.gridTemplateColumns = "inherit";
+    element.style.gridTemplateRows = "inherit";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'50px (last)'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'(first) 101px'");
 
     document.body.removeChild(parentElement);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
 testInherit();
 
 function testInitial()
@@ -125,19 +125,19 @@ function testInitial()
     element.style.display = "grid";
     element.style.width = "300px";
     element.style.height = "150px";
-    element.style.gridDefinitionColumns = "150% (last)";
-    element.style.gridDefinitionRows = "(first) 1fr";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'450px (last)'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'(first) 150px'");
+    element.style.gridTemplateColumns = "150% (last)";
+    element.style.gridTemplateRows = "(first) 1fr";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'450px (last)'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'(first) 150px'");
 
     element.style.display = "grid";
-    element.style.gridDefinitionColumns = "initial";
-    element.style.gridDefinitionRows = "initial";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+    element.style.gridTemplateColumns = "initial";
+    element.style.gridTemplateRows = "initial";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
     document.body.removeChild(element);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
 testInitial();
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
index c921cce..ca22800 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js
@@ -2,8 +2,8 @@ function testGridDefinitionsValues(element, columnValue, rowValue, computedColum
 {
     window.element = element;
     var elementID = element.id || "element";
-    shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-definition-columns')", computedColumnValue || columnValue);
-    shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-definition-rows')", computedRowValue || rowValue);
+    shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-columns')", computedColumnValue || columnValue);
+    shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('grid-template-rows')", computedRowValue || rowValue);
 }
 
 function testGridDefinitionsSetJSValues(columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
@@ -26,12 +26,12 @@ function checkGridDefinitionsSetJSValues(useGrid, columnValue, rowValue, compute
         element.style.height = "600px";
     }
     element.style.font = "10px Ahem"; // Used to resolve em font consistently.
-    element.style.gridDefinitionColumns = columnValue;
-    element.style.gridDefinitionRows = rowValue;
-    shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", computedColumnValue || columnValue);
-    shouldBeEqualToString("element.style.gridDefinitionColumns", jsColumnValue || columnValue);
-    shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", computedRowValue || rowValue);
-    shouldBeEqualToString("element.style.gridDefinitionRows", jsRowValue || rowValue);
+    element.style.gridTemplateColumns = columnValue;
+    element.style.gridTemplateRows = rowValue;
+    shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", computedColumnValue || columnValue);
+    shouldBeEqualToString("element.style.gridTemplateColumns", jsColumnValue || columnValue);
+    shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", computedRowValue || rowValue);
+    shouldBeEqualToString("element.style.gridTemplateRows", jsRowValue || rowValue);
     document.body.removeChild(element);
 }
 
@@ -39,9 +39,9 @@ function testGridDefinitionsSetBadJSValues(columnValue, rowValue)
 {
     window.element = document.createElement("div");
     document.body.appendChild(element);
-    element.style.gridDefinitionColumns = columnValue;
-    element.style.gridDefinitionRows = rowValue;
-    // We can't use testSetJSValues as element.style.gridDefinitionRows returns "".
+    element.style.gridTemplateColumns = columnValue;
+    element.style.gridTemplateRows = rowValue;
+    // We can't use testSetJSValues as element.style.gridTemplateRows returns "".
     testGridDefinitionsValues(element, "none", "none");
     document.body.removeChild(element);
 }
\ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
index 2c6505b..3d96365 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js
@@ -1,6 +1,6 @@
-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"), "7px 11px", "17px 2px");
 testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%");
 testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "auto auto", "auto auto");
@@ -22,11 +22,11 @@ debug("");
 debug("Test the initial value");
 var element = document.createElement("div");
 document.body.appendChild(element);
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
 debug("");
-debug("Test getting and setting grid-definition-rows and grid-definition-columns through JS");
+debug("Test getting and setting grid-template-rows and grid-template-columns through JS");
 testNonGridDefinitionsSetJSValues("18px 22px", "66px 70px");
 testNonGridDefinitionsSetJSValues("55% 80%", "40% 63%");
 testNonGridDefinitionsSetJSValues("auto auto", "auto auto");
@@ -38,12 +38,12 @@ testNonGridDefinitionsSetJSValues("50% 12vw", "5% 85vh", "50% 96px", "5% 510px")
 debug("");
 debug("Test getting wrong values set from CSS");
 var gridWithNoneAndAuto = document.getElementById("gridWithNoneAndAuto");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('grid-template-rows')", "'none'");
 
 var gridWithNoneAndFixed = document.getElementById("gridWithNoneAndFixed");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('grid-template-rows')", "'none'");
 
 debug("");
 debug("Test setting and getting wrong values from JS");
@@ -62,37 +62,37 @@ function testInherit()
 {
     var parentElement = document.createElement("div");
     document.body.appendChild(parentElement);
-    parentElement.style.gridDefinitionColumns = "50px 1fr (last)";
-    parentElement.style.gridDefinitionRows = "101% (middle) 45px";
+    parentElement.style.gridTemplateColumns = "50px 1fr (last)";
+    parentElement.style.gridTemplateRows = "101% (middle) 45px";
     testGridDefinitionsValues(parentElement, "50px 1fr (last)", "101% (middle) 45px");
 
     element = document.createElement("div");
     parentElement.appendChild(element);
-    element.style.gridDefinitionColumns = "inherit";
-    element.style.gridDefinitionRows = "inherit";
+    element.style.gridTemplateColumns = "inherit";
+    element.style.gridTemplateRows = "inherit";
     testGridDefinitionsValues(element, "50px 1fr (last)", "101% (middle) 45px");
 
     document.body.removeChild(parentElement);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
 testInherit();
 
 function testInitial()
 {
     element = document.createElement("div");
     document.body.appendChild(element);
-    element.style.gridDefinitionColumns = "150% (middle) 55px";
-    element.style.gridDefinitionRows = "1fr (line) 2fr (line)";
+    element.style.gridTemplateColumns = "150% (middle) 55px";
+    element.style.gridTemplateRows = "1fr (line) 2fr (line)";
     testGridDefinitionsValues(element, "150% (middle) 55px", "1fr (line) 2fr (line)");
 
-    element.style.gridDefinitionColumns = "initial";
-    element.style.gridDefinitionRows = "initial";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+    element.style.gridTemplateColumns = "initial";
+    element.style.gridTemplateRows = "initial";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
     document.body.removeChild(element);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
 testInitial();
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
index 0202ec0..9bbb6f1 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js
@@ -1,6 +1,6 @@
-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("gridWithNoneElement"), "none", "none");
 testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
 testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53%", "27%");
@@ -17,7 +17,7 @@ testGridDefinitionsValues(document.getElementById("gridWithCalcInsideMinMax"), "
 testGridDefinitionsValues(document.getElementById("gridWithCalcComplexInsideMinMax"), "minmax(10%, calc(50% + 15px))", "minmax(calc(20px + 10%), 50%)");
 
 debug("");
-debug("Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none')");
+debug("Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')");
 var gridWithFitContentElement = document.getElementById("gridWithFitContentElement");
 testGridDefinitionsValues(gridWithFitContentElement, "none", "none");
 
@@ -29,11 +29,11 @@ debug("Test the initial value");
 var element = document.createElement("div");
 document.body.appendChild(element);
 testGridDefinitionsValues(element, "none", "none");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
 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("18px", "66px");
 testNonGridDefinitionsSetJSValues("55%", "40%");
 testNonGridDefinitionsSetJSValues("auto", "auto");
@@ -42,7 +42,7 @@ testNonGridDefinitionsSetJSValues("min-content", "min-content");
 testNonGridDefinitionsSetJSValues("max-content", "max-content");
 
 debug("");
-debug("Test getting and setting grid-definition-columns and grid-definition-rows to minmax() values through JS");
+debug("Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS");
 testNonGridDefinitionsSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)");
 testNonGridDefinitionsSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "minmax(220px, 48px)", "minmax(80px, 50px)");
 testNonGridDefinitionsSetJSValues("minmax(min-content, 8vh)", "minmax(10vw, min-content)", "minmax(min-content, 48px)", "minmax(80px, min-content)");
@@ -56,7 +56,7 @@ testNonGridDefinitionsSetJSValues("3.1459fr", "2.718fr");
 testNonGridDefinitionsSetJSValues("+3fr", "+4fr", "3fr", "4fr", "3fr", "4fr");
 
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to bad values through JS");
+debug("Test setting grid-template-columns and grid-template-rows to bad values through JS");
 // No comma and only 1 argument provided.
 testGridDefinitionsSetBadJSValues("minmax(10px 20px)", "minmax(10px)")
 // Nested minmax and only 2 arguments are allowed.
@@ -76,7 +76,7 @@ testGridDefinitionsSetBadJSValues("-1px", "-6em");
 testGridDefinitionsSetBadJSValues("minmax(-1%, 32%)", "minmax(2vw, -6em)");
 
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS");
+debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
 testNonGridDefinitionsSetJSValues("18px", "66px");
 testNonGridDefinitionsSetJSValues("none", "none");
 
@@ -84,38 +84,38 @@ function testInherit()
 {
     var parentElement = document.createElement("div");
     document.body.appendChild(parentElement);
-    parentElement.style.gridDefinitionColumns = "50px (last)";
-    parentElement.style.gridDefinitionRows = "(first) 101%";
+    parentElement.style.gridTemplateColumns = "50px (last)";
+    parentElement.style.gridTemplateRows = "(first) 101%";
 
     element = document.createElement("div");
     parentElement.appendChild(element);
-    element.style.gridDefinitionColumns = "inherit";
-    element.style.gridDefinitionRows = "inherit";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'50px (last)'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'(first) 101%'");
+    element.style.gridTemplateColumns = "inherit";
+    element.style.gridTemplateRows = "inherit";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'50px (last)'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'(first) 101%'");
 
     document.body.removeChild(parentElement);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
 testInherit();
 
 function testInitial()
 {
     element = document.createElement("div");
     document.body.appendChild(element);
-    element.style.gridDefinitionColumns = "150% (last)";
-    element.style.gridDefinitionRows = "(first) 1fr";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'150% (last)'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'(first) 1fr'");
+    element.style.gridTemplateColumns = "150% (last)";
+    element.style.gridTemplateRows = "(first) 1fr";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'150% (last)'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'(first) 1fr'");
 
-    element.style.gridDefinitionColumns = "initial";
-    element.style.gridDefinitionRows = "initial";
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "'none'");
-    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-definition-rows')", "'none'");
+    element.style.gridTemplateColumns = "initial";
+    element.style.gridTemplateRows = "initial";
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "'none'");
+    shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows')", "'none'");
 
     document.body.removeChild(element);
 }
 debug("");
-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
 testInitial();
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting-overflow.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting-overflow.html
index 08e0638..ad91bfd 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting-overflow.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting-overflow.html
@@ -4,8 +4,8 @@
 <body>
 <style>
     .grid {
-        grid-definition-rows: repeat(5, 100px);
-        grid-definition-columns: repeat(5, 100px);
+        grid-template-rows: repeat(5, 100px);
+        grid-template-columns: repeat(5, 100px);
         width: -webkit-fit-content;
         background-color: red;
     }
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting.html
index 2daf7ed..ef3f899 100644
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting.html
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/scrolled-grid-painting.html
@@ -4,8 +4,8 @@
 <body>
 <style>
     .grid {
-        grid-definition-rows: repeat(5, 100px);
-        grid-definition-columns: repeat(5, 100px);
+        grid-template-rows: repeat(5, 100px);
+        grid-template-columns: repeat(5, 100px);
         width: -webkit-fit-content;
         background-color: red;
     }
diff --git a/third_party/WebKit/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html b/third_party/WebKit/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html
index 3bc54b7..c027826 100644
--- a/third_party/WebKit/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html
+++ b/third_party/WebKit/LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html
@@ -66,8 +66,8 @@
     }
     .grid.content * {
         display: inline-grid;
-        grid-definition-rows: 100px;
-        grid-definition-columns: 100px;
+        grid-template-rows: 100px;
+        grid-template-columns: 100px;
     }
     .grid.content * {
         grid-row-start: 1;
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm
index 53ecd1f..5d690f4 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm
@@ -50,16 +50,16 @@
                 display: -webkit-grid;
                 display: grid;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #title
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001.htm
index 53ecd1f..5d690f4 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-001.htm
@@ -50,16 +50,16 @@
                 display: -webkit-grid;
                 display: grid;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #title
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002-expected.htm
index 9182065..ec717da 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002-expected.htm
@@ -50,16 +50,16 @@
                 display: -webkit-inline-grid;
                 display: inline-grid;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #title
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002.htm
index 9182065..ec717da 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/display-grid-002.htm
@@ -50,16 +50,16 @@
                 display: -webkit-inline-grid;
                 display: inline-grid;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #title
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002-expected.htm
index 6f2e421..72b31c9 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002-expected.htm
@@ -46,16 +46,16 @@
                 display: grid;
                 font: 20px/1 ahem;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
         </style>
     </head>
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm
index a829059..8e5e668 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm
@@ -46,16 +46,16 @@
                 display: grid;
                 font: 20px/1 ahem;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #griditem
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003-expected.htm
index 604ad52..1d81d46 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003-expected.htm
@@ -46,16 +46,16 @@
                 display: grid;
                 font: 20px/1 ahem;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             span
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm
index 87381be..d885287 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm
@@ -46,16 +46,16 @@
                 display: grid;
                 font: 20px/1 ahem;
                 height: 3em;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #griditem
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001-expected.htm
index ed5d0d2..abbd686 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001-expected.htm
@@ -32,7 +32,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://dev.w3.org/csswg/css3-grid-align/#grid-declaration" />
         <meta name="flags" content="ahem invalid" />
-        <meta name="assert" content="The 'grid-definition-columns' property set to a negative length value is invalid. Value then computes to its initial value, 'auto'." />
+        <meta name="assert" content="The 'grid-template-columns' property set to a negative length value is invalid. Value then computes to its initial value, 'auto'." />
         <script src="testRunnerEnableGrid.js"></script>
         <style type="text/css">
             #parent
@@ -50,16 +50,16 @@
                 display: -webkit-grid;
                 display: grid;
                 height: 3em;
-                -ms-grid-definition-columns: -1em;
-                -moz-grid-definition-columns: -1em;
-                -o-grid-definition-columns: -1em;
-                -webkit-grid-definition-columns: -1em;
-                grid-definition-columns: -1em;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: -1em;
+                -moz-grid-template-columns: -1em;
+                -o-grid-template-columns: -1em;
+                -webkit-grid-template-columns: -1em;
+                grid-template-columns: -1em;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #left
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001.htm
index ed5d0d2..abbd686 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-columns-001.htm
@@ -32,7 +32,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://dev.w3.org/csswg/css3-grid-align/#grid-declaration" />
         <meta name="flags" content="ahem invalid" />
-        <meta name="assert" content="The 'grid-definition-columns' property set to a negative length value is invalid. Value then computes to its initial value, 'auto'." />
+        <meta name="assert" content="The 'grid-template-columns' property set to a negative length value is invalid. Value then computes to its initial value, 'auto'." />
         <script src="testRunnerEnableGrid.js"></script>
         <style type="text/css">
             #parent
@@ -50,16 +50,16 @@
                 display: -webkit-grid;
                 display: grid;
                 height: 3em;
-                -ms-grid-definition-columns: -1em;
-                -moz-grid-definition-columns: -1em;
-                -o-grid-definition-columns: -1em;
-                -webkit-grid-definition-columns: -1em;
-                grid-definition-columns: -1em;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: -1em;
+                -moz-grid-template-columns: -1em;
+                -o-grid-template-columns: -1em;
+                -webkit-grid-template-columns: -1em;
+                grid-template-columns: -1em;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
             }
             #left
             {
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001-expected.htm
index e31735f..c37a470 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001-expected.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             #griditem
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001.htm
index e31735f..c37a470 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-001.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             #griditem
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002-expected.htm
index 9f81e37..c3a32ec 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002-expected.htm
@@ -44,16 +44,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             div div
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002.htm
index 12e045c..d9107bb 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-002.htm
@@ -44,16 +44,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             div div
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003-expected.htm
index d5a2cbe..4864757 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003-expected.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             div div
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003.htm
index df9f939..77e4f0c 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-003.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             div div
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004-expected.htm
index ca3e467..e106818 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004-expected.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             div div
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004.htm
index ca3e467..e106818 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-004.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             div div
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm
index 783dfcb..46e5ed8 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             #griditem
diff --git a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005.htm b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005.htm
index 783dfcb..46e5ed8 100644
--- a/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005.htm
+++ b/third_party/WebKit/LayoutTests/ietestcenter/css3/grid/grid-items-005.htm
@@ -45,16 +45,16 @@
                 display: -webkit-grid;
                 display: grid;
                 font: 20px/1 ahem;
-                -ms-grid-definition-columns: auto 1fr;
-                -moz-grid-definition-columns: auto 1fr;
-                -o-grid-definition-columns: auto 1fr;
-                -webkit-grid-definition-columns: auto 1fr;
-                grid-definition-columns: auto 1fr;
-                -ms-grid-definition-rows: auto 1fr;
-                -moz-grid-definition-rows: auto 1fr;
-                -o-grid-definition-rows: auto 1fr;
-                -webkit-grid-definition-rows: auto 1fr;
-                grid-definition-rows: auto 1fr;
+                -ms-grid-template-columns: auto 1fr;
+                -moz-grid-template-columns: auto 1fr;
+                -o-grid-template-columns: auto 1fr;
+                -webkit-grid-template-columns: auto 1fr;
+                grid-template-columns: auto 1fr;
+                -ms-grid-template-rows: auto 1fr;
+                -moz-grid-template-rows: auto 1fr;
+                -o-grid-template-rows: auto 1fr;
+                -webkit-grid-template-rows: auto 1fr;
+                grid-template-rows: auto 1fr;
                 width: 12em;
             }
             #griditem
diff --git a/third_party/WebKit/LayoutTests/virtual/stable/webexposed/nonstable-css-properties-expected.txt b/third_party/WebKit/LayoutTests/virtual/stable/webexposed/nonstable-css-properties-expected.txt
index 6df9f3b6..6a887ad 100644
--- a/third_party/WebKit/LayoutTests/virtual/stable/webexposed/nonstable-css-properties-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/stable/webexposed/nonstable-css-properties-expected.txt
@@ -35,13 +35,13 @@ el.style.setProperty('grid-auto-rows', 'auto')
 el.style.getPropertyValue('grid-auto-rows') is null
 getComputedStyle(el).getPropertyValue('grid-auto-rows') is null
 
-el.style.setProperty('grid-definition-columns', 'min-content')
-el.style.getPropertyValue('grid-definition-columns') is null
-getComputedStyle(el).getPropertyValue('grid-definition-columns') is null
+el.style.setProperty('grid-template-columns', 'min-content')
+el.style.getPropertyValue('grid-template-columns') is null
+getComputedStyle(el).getPropertyValue('grid-template-columns') is null
 
-el.style.setProperty('grid-definition-rows', 'max-content')
-el.style.getPropertyValue('grid-definition-rows') is null
-getComputedStyle(el).getPropertyValue('grid-definition-rows') is null
+el.style.setProperty('grid-template-rows', 'max-content')
+el.style.getPropertyValue('grid-template-rows') is null
+getComputedStyle(el).getPropertyValue('grid-template-rows') is null
 
 el.style.setProperty('grid-column-start', 'auto')
 el.style.getPropertyValue('grid-column-start') is null
diff --git a/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt b/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
index 37ce513..ec53a1e 100644
--- a/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
@@ -117,12 +117,12 @@ gridAutoRows
 gridColumn
 gridColumnEnd
 gridColumnStart
-gridDefinitionColumns
-gridDefinitionRows
 gridRow
 gridRowEnd
 gridRowStart
 gridTemplateAreas
+gridTemplateColumns
+gridTemplateRows
 height
 imageRendering
 isolation
diff --git a/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties-expected.txt b/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties-expected.txt
index f82ed7b2..ce077e6 100644
--- a/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties-expected.txt
@@ -35,13 +35,13 @@ el.style.setProperty('grid-auto-rows', 'auto')
 el.style.getPropertyValue('grid-auto-rows') is auto
 getComputedStyle(el).getPropertyValue('grid-auto-rows') is auto
 
-el.style.setProperty('grid-definition-columns', 'min-content')
-el.style.getPropertyValue('grid-definition-columns') is min-content
-getComputedStyle(el).getPropertyValue('grid-definition-columns') is min-content
+el.style.setProperty('grid-template-columns', 'min-content')
+el.style.getPropertyValue('grid-template-columns') is min-content
+getComputedStyle(el).getPropertyValue('grid-template-columns') is min-content
 
-el.style.setProperty('grid-definition-rows', 'max-content')
-el.style.getPropertyValue('grid-definition-rows') is max-content
-getComputedStyle(el).getPropertyValue('grid-definition-rows') is max-content
+el.style.setProperty('grid-template-rows', 'max-content')
+el.style.getPropertyValue('grid-template-rows') is max-content
+getComputedStyle(el).getPropertyValue('grid-template-rows') is max-content
 
 el.style.setProperty('grid-column-start', 'auto')
 el.style.getPropertyValue('grid-column-start') is auto
diff --git a/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties.html b/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties.html
index e0d1ecd..4f95eb1 100644
--- a/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties.html
+++ b/third_party/WebKit/LayoutTests/webexposed/nonstable-css-properties.html
@@ -31,8 +31,8 @@ var properties = [
 
 ['grid-auto-columns', 'auto'],
 ['grid-auto-rows', 'auto'],
-['grid-definition-columns', 'min-content'],
-['grid-definition-rows', 'max-content'],
+['grid-template-columns', 'min-content'],
+['grid-template-rows', 'max-content'],
 ['grid-column-start', 'auto'],
 ['grid-column-end', '2'],
 ['grid-row-start', '1'],
diff --git a/third_party/WebKit/PerformanceTests/Layout/auto-grid-lots-of-data.html b/third_party/WebKit/PerformanceTests/Layout/auto-grid-lots-of-data.html
index 601b01d..54fc99a 100644
--- a/third_party/WebKit/PerformanceTests/Layout/auto-grid-lots-of-data.html
+++ b/third_party/WebKit/PerformanceTests/Layout/auto-grid-lots-of-data.html
@@ -9,8 +9,8 @@ html, body {
 
 body {
     display: grid;
-    grid-definition-rows: repeat(100, auto);
-    grid-definition-columns: repeat(100, auto);;
+    grid-template-rows: repeat(100, auto);
+    grid-template-columns: repeat(100, auto);;
 }
 
 .gridItem {
diff --git a/third_party/WebKit/PerformanceTests/Layout/fixed-grid-lots-of-data.html b/third_party/WebKit/PerformanceTests/Layout/fixed-grid-lots-of-data.html
index 2801460..8f69407 100644
--- a/third_party/WebKit/PerformanceTests/Layout/fixed-grid-lots-of-data.html
+++ b/third_party/WebKit/PerformanceTests/Layout/fixed-grid-lots-of-data.html
@@ -9,8 +9,8 @@ html, body {
 
 body {
     display: grid;
-    grid-definition-rows: repeat(100, 200px);
-    grid-definition-columns: repeat(20, 200px);;
+    grid-template-rows: repeat(100, 200px);
+    grid-template-columns: repeat(20, 200px);;
 }
 
 .gridItem {
diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
index dbd5d4a..5569c5a 100644
--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -270,8 +270,8 @@ static const CSSPropertyID staticComputableProperties[] = {
     CSSPropertyGridAutoRows,
     CSSPropertyGridColumnEnd,
     CSSPropertyGridColumnStart,
-    CSSPropertyGridDefinitionColumns,
-    CSSPropertyGridDefinitionRows,
+    CSSPropertyGridTemplateColumns,
+    CSSPropertyGridTemplateRows,
     CSSPropertyGridRowEnd,
     CSSPropertyGridRowStart,
     CSSPropertyWebkitHighlight,
@@ -894,7 +894,7 @@ static void addValuesForNamedGridLinesAtIndex(const OrderedNamedGridLines& order
 
 static PassRefPtr<CSSValue> valueForGridTrackList(GridTrackSizingDirection direction, RenderObject* renderer, const RenderStyle& style)
 {
-    const Vector<GridTrackSize>& trackSizes = direction == ForColumns ? style.gridDefinitionColumns() : style.gridDefinitionRows();
+    const Vector<GridTrackSize>& trackSizes = direction == ForColumns ? style.gridTemplateColumns() : style.gridTemplateRows();
     const OrderedNamedGridLines& orderedNamedGridLines = direction == ForColumns ? style.orderedNamedGridColumnLines() : style.orderedNamedGridRowLines();
 
     // Handle the 'none' case here.
@@ -1454,8 +1454,8 @@ static bool isLayoutDependent(CSSPropertyID propertyID, PassRefPtr<RenderStyle>
     // FIXME: Some of these cases could be narrowed down or optimized better.
     switch (propertyID) {
     case CSSPropertyBottom:
-    case CSSPropertyGridDefinitionColumns:
-    case CSSPropertyGridDefinitionRows:
+    case CSSPropertyGridTemplateColumns:
+    case CSSPropertyGridTemplateRows:
     case CSSPropertyHeight:
     case CSSPropertyLeft:
     case CSSPropertyRight:
@@ -1948,9 +1948,9 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
         case CSSPropertyGridAutoRows:
             return specifiedValueForGridTrackSize(style->gridAutoRows(), *style);
 
-        case CSSPropertyGridDefinitionColumns:
+        case CSSPropertyGridTemplateColumns:
             return valueForGridTrackList(ForColumns, renderer, *style);
-        case CSSPropertyGridDefinitionRows:
+        case CSSPropertyGridTemplateRows:
             return valueForGridTrackList(ForRows, renderer, *style);
 
         case CSSPropertyGridColumnStart:
diff --git a/third_party/WebKit/Source/core/css/CSSProperty.cpp b/third_party/WebKit/Source/core/css/CSSProperty.cpp
index 6a9df98..ac45820 100644
--- a/third_party/WebKit/Source/core/css/CSSProperty.cpp
+++ b/third_party/WebKit/Source/core/css/CSSProperty.cpp
@@ -593,8 +593,8 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
     case CSSPropertyGridColumn:
     case CSSPropertyGridColumnEnd:
     case CSSPropertyGridColumnStart:
-    case CSSPropertyGridDefinitionColumns:
-    case CSSPropertyGridDefinitionRows:
+    case CSSPropertyGridTemplateColumns:
+    case CSSPropertyGridTemplateRows:
     case CSSPropertyGridRow:
     case CSSPropertyGridRowEnd:
     case CSSPropertyGridRowStart:
diff --git a/third_party/WebKit/Source/core/css/CSSPropertyNames.in b/third_party/WebKit/Source/core/css/CSSPropertyNames.in
index 8b94be9c..b0f2a49 100644
--- a/third_party/WebKit/Source/core/css/CSSPropertyNames.in
+++ b/third_party/WebKit/Source/core/css/CSSPropertyNames.in
@@ -323,8 +323,8 @@ grid-area
 grid-column
 grid-column-end
 grid-column-start
-grid-definition-columns
-grid-definition-rows
+grid-template-columns
+grid-template-rows
 grid-row
 grid-row-end
 grid-row-start
diff --git a/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp b/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp
index f913624..2c12c69 100644
--- a/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp
+++ b/third_party/WebKit/Source/core/css/RuntimeCSSEnabled.cpp
@@ -82,8 +82,8 @@ static void setPropertySwitchesFromRuntimeFeatures()
     CSSPropertyID cssGridLayoutProperties[] = {
         CSSPropertyGridAutoColumns,
         CSSPropertyGridAutoRows,
-        CSSPropertyGridDefinitionColumns,
-        CSSPropertyGridDefinitionRows,
+        CSSPropertyGridTemplateColumns,
+        CSSPropertyGridTemplateRows,
         CSSPropertyGridColumnStart,
         CSSPropertyGridColumnEnd,
         CSSPropertyGridRowStart,
diff --git a/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp b/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
index ae1be58..e11ca08 100644
--- a/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
+++ b/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
@@ -2456,8 +2456,8 @@ bool BisonCSSParser::parseValue(CSSPropertyID propId, bool important)
         parsedValue = parseGridTrackSize(*m_valueList);
         break;
 
-    case CSSPropertyGridDefinitionColumns:
-    case CSSPropertyGridDefinitionRows:
+    case CSSPropertyGridTemplateColumns:
+    case CSSPropertyGridTemplateRows:
         if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
             return false;
         return parseGridTrackList(propId, important);
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
index 4636260..1a5623e 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -1625,15 +1625,15 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
         state.style()->setGridAutoRows(createGridTrackSize(value, state));
         return;
     }
-    case CSSPropertyGridDefinitionColumns: {
+    case CSSPropertyGridTemplateColumns: {
         if (isInherit) {
-            state.style()->setGridDefinitionColumns(state.parentStyle()->gridDefinitionColumns());
+            state.style()->setGridTemplateColumns(state.parentStyle()->gridTemplateColumns());
             state.style()->setNamedGridColumnLines(state.parentStyle()->namedGridColumnLines());
             state.style()->setOrderedNamedGridColumnLines(state.parentStyle()->orderedNamedGridColumnLines());
             return;
         }
         if (isInitial) {
-            state.style()->setGridDefinitionColumns(RenderStyle::initialGridDefinitionColumns());
+            state.style()->setGridTemplateColumns(RenderStyle::initialGridTemplateColumns());
             state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGridColumnLines());
             state.style()->setOrderedNamedGridColumnLines(RenderStyle::initialOrderedNamedGridColumnLines());
             return;
@@ -1644,20 +1644,20 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
         OrderedNamedGridLines orderedNamedGridLines;
         if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
             return;
-        state.style()->setGridDefinitionColumns(trackSizes);
+        state.style()->setGridTemplateColumns(trackSizes);
         state.style()->setNamedGridColumnLines(namedGridLines);
         state.style()->setOrderedNamedGridColumnLines(orderedNamedGridLines);
         return;
     }
-    case CSSPropertyGridDefinitionRows: {
+    case CSSPropertyGridTemplateRows: {
         if (isInherit) {
-            state.style()->setGridDefinitionRows(state.parentStyle()->gridDefinitionRows());
+            state.style()->setGridTemplateRows(state.parentStyle()->gridTemplateRows());
             state.style()->setNamedGridRowLines(state.parentStyle()->namedGridRowLines());
             state.style()->setOrderedNamedGridRowLines(state.parentStyle()->orderedNamedGridRowLines());
             return;
         }
         if (isInitial) {
-            state.style()->setGridDefinitionRows(RenderStyle::initialGridDefinitionRows());
+            state.style()->setGridTemplateRows(RenderStyle::initialGridTemplateRows());
             state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRowLines());
             state.style()->setOrderedNamedGridRowLines(RenderStyle::initialOrderedNamedGridRowLines());
             return;
@@ -1668,7 +1668,7 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
         OrderedNamedGridLines orderedNamedGridLines;
         if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
             return;
-        state.style()->setGridDefinitionRows(trackSizes);
+        state.style()->setGridTemplateRows(trackSizes);
         state.style()->setNamedGridRowLines(namedGridLines);
         state.style()->setOrderedNamedGridRowLines(orderedNamedGridLines);
         return;
diff --git a/third_party/WebKit/Source/core/frame/UseCounter.cpp b/third_party/WebKit/Source/core/frame/UseCounter.cpp
index 24fc31a..505c110 100644
--- a/third_party/WebKit/Source/core/frame/UseCounter.cpp
+++ b/third_party/WebKit/Source/core/frame/UseCounter.cpp
@@ -294,8 +294,8 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id)
     case CSSPropertyFlexWrap: return 239;
     case CSSPropertyJustifyContent: return 240;
     case CSSPropertyWebkitFontSizeDelta: return 241;
-    case CSSPropertyGridDefinitionColumns: return 242;
-    case CSSPropertyGridDefinitionRows: return 243;
+    case CSSPropertyGridTemplateColumns: return 242;
+    case CSSPropertyGridTemplateRows: return 243;
     case CSSPropertyGridColumnStart: return 244;
     case CSSPropertyGridColumnEnd: return 245;
     case CSSPropertyGridRowStart: return 246;
diff --git a/third_party/WebKit/Source/core/rendering/RenderGrid.cpp b/third_party/WebKit/Source/core/rendering/RenderGrid.cpp
index df992ae..e5f2e11 100644
--- a/third_party/WebKit/Source/core/rendering/RenderGrid.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderGrid.cpp
@@ -238,8 +238,8 @@ void RenderGrid::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl
 
 bool RenderGrid::explicitGridDidResize(const RenderStyle* oldStyle) const
 {
-    return oldStyle->gridDefinitionColumns().size() != style()->gridDefinitionColumns().size()
-        || oldStyle->gridDefinitionRows().size() != style()->gridDefinitionRows().size();
+    return oldStyle->gridTemplateColumns().size() != style()->gridTemplateColumns().size()
+        || oldStyle->gridTemplateRows().size() != style()->gridTemplateRows().size();
 }
 
 bool RenderGrid::namedGridLinesDefinitionDidChange(const RenderStyle* oldStyle) const
@@ -528,7 +528,7 @@ double RenderGrid::computeNormalizedFractionBreadth(Vector<GridTrack>& tracks, c
 
 const GridTrackSize& RenderGrid::gridTrackSize(GridTrackSizingDirection direction, size_t i) const
 {
-    const Vector<GridTrackSize>& trackStyles = (direction == ForColumns) ? style()->gridDefinitionColumns() : style()->gridDefinitionRows();
+    const Vector<GridTrackSize>& trackStyles = (direction == ForColumns) ? style()->gridTemplateColumns() : style()->gridTemplateRows();
     if (i >= trackStyles.size())
         return (direction == ForColumns) ? style()->gridAutoColumns() : style()->gridAutoRows();
 
@@ -547,12 +547,12 @@ const GridTrackSize& RenderGrid::gridTrackSize(GridTrackSizingDirection directio
 
 size_t RenderGrid::explicitGridColumnCount() const
 {
-    return style()->gridDefinitionColumns().size();
+    return style()->gridTemplateColumns().size();
 }
 
 size_t RenderGrid::explicitGridRowCount() const
 {
-    return style()->gridDefinitionRows().size();
+    return style()->gridTemplateRows().size();
 }
 
 size_t RenderGrid::explicitGridSizeForSide(GridPositionSide side) const
@@ -772,8 +772,8 @@ void RenderGrid::placeItemsOnGrid()
         insertItemIntoGrid(child, GridCoordinate(*rowPositions, *columnPositions));
     }
 
-    ASSERT(gridRowCount() >= style()->gridDefinitionRows().size());
-    ASSERT(gridColumnCount() >= style()->gridDefinitionColumns().size());
+    ASSERT(gridRowCount() >= style()->gridTemplateRows().size());
+    ASSERT(gridColumnCount() >= style()->gridTemplateColumns().size());
 
     if (autoFlow == AutoFlowNone) {
         // If we did collect some grid items, they won't be placed thus never laid out.
diff --git a/third_party/WebKit/Source/core/rendering/style/RenderStyle.h b/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
index 8b5dd22..db5d1ec 100644
--- a/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
+++ b/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
@@ -774,8 +774,8 @@ public:
     ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonInheritedData->m_justifySelf); }
     OverflowAlignment justifySelfOverflowAlignment() const { return static_cast<OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); }
 
-    const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonInheritedData->m_grid->m_gridDefinitionColumns; }
-    const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInheritedData->m_grid->m_gridDefinitionRows; }
+    const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInheritedData->m_grid->m_gridTemplateColumns; }
+    const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheritedData->m_grid->m_gridTemplateRows; }
     const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheritedData->m_grid->m_namedGridColumnLines; }
     const NamedGridLinesMap& namedGridRowLines() const { return rareNonInheritedData->m_grid->m_namedGridRowLines; }
     const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return rareNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
@@ -1259,8 +1259,8 @@ public:
     void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment); }
     void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoColumns, length); }
     void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoRows, length); }
-    void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); }
-    void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); }
+    void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); }
+    void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); }
     void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGridColumnLines); }
     void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLines); }
     void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedNamedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridColumnLines, orderedNamedGridColumnLines); }
@@ -1689,8 +1689,8 @@ public:
     static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant; }
 
     // The initial value is 'none' for grid tracks.
-    static Vector<GridTrackSize> initialGridDefinitionColumns() { return Vector<GridTrackSize>(); }
-    static Vector<GridTrackSize> initialGridDefinitionRows() { return Vector<GridTrackSize>(); }
+    static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<GridTrackSize>(); }
+    static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridTrackSize>(); }
 
     static GridAutoFlow initialGridAutoFlow() { return AutoFlowNone; }
 
diff --git a/third_party/WebKit/Source/core/rendering/style/StyleGridData.cpp b/third_party/WebKit/Source/core/rendering/style/StyleGridData.cpp
index a3f8a34..d323864 100644
--- a/third_party/WebKit/Source/core/rendering/style/StyleGridData.cpp
+++ b/third_party/WebKit/Source/core/rendering/style/StyleGridData.cpp
@@ -31,8 +31,8 @@
 namespace WebCore {
 
 StyleGridData::StyleGridData()
-    : m_gridDefinitionColumns(RenderStyle::initialGridDefinitionColumns())
-    , m_gridDefinitionRows(RenderStyle::initialGridDefinitionRows())
+    : m_gridTemplateColumns(RenderStyle::initialGridTemplateColumns())
+    , m_gridTemplateRows(RenderStyle::initialGridTemplateRows())
     , m_namedGridColumnLines(RenderStyle::initialNamedGridColumnLines())
     , m_namedGridRowLines(RenderStyle::initialNamedGridRowLines())
     , m_orderedNamedGridColumnLines(RenderStyle::initialOrderedNamedGridColumnLines())
@@ -48,8 +48,8 @@ StyleGridData::StyleGridData()
 
 StyleGridData::StyleGridData(const StyleGridData& o)
     : RefCounted<StyleGridData>()
-    , m_gridDefinitionColumns(o.m_gridDefinitionColumns)
-    , m_gridDefinitionRows(o.m_gridDefinitionRows)
+    , m_gridTemplateColumns(o.m_gridTemplateColumns)
+    , m_gridTemplateRows(o.m_gridTemplateRows)
     , m_namedGridColumnLines(o.m_namedGridColumnLines)
     , m_namedGridRowLines(o.m_namedGridRowLines)
     , m_orderedNamedGridColumnLines(o.m_orderedNamedGridColumnLines)
diff --git a/third_party/WebKit/Source/core/rendering/style/StyleGridData.h b/third_party/WebKit/Source/core/rendering/style/StyleGridData.h
index c7f5e54..da14eaa 100644
--- a/third_party/WebKit/Source/core/rendering/style/StyleGridData.h
+++ b/third_party/WebKit/Source/core/rendering/style/StyleGridData.h
@@ -46,7 +46,7 @@ public:
 
     bool operator==(const StyleGridData& o) const
     {
-        return m_gridDefinitionColumns == o.m_gridDefinitionColumns && m_gridDefinitionRows == o.m_gridDefinitionRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAutoRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns && m_namedGridColumnLines == o.m_namedGridColumnLines && m_namedGridRowLines == o.m_namedGridRowLines && m_orderedNamedGridColumnLines == o.m_orderedNamedGridColumnLines && m_orderedNamedGridRowLines == o.m_orderedNamedGridRowLines && m_namedGridArea == o.m_namedGridArea && m_namedGridArea == o.m_namedGridArea && m_namedGridAreaRowCount == o.m_namedGridAreaRowCount && m_namedGridAreaColumnCount == o.m_namedGridAreaColumnCount;
+        return m_gridTemplateColumns == o.m_gridTemplateColumns && m_gridTemplateRows == o.m_gridTemplateRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAutoRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns && m_namedGridColumnLines == o.m_namedGridColumnLines && m_namedGridRowLines == o.m_namedGridRowLines && m_orderedNamedGridColumnLines == o.m_orderedNamedGridColumnLines && m_orderedNamedGridRowLines == o.m_orderedNamedGridRowLines && m_namedGridArea == o.m_namedGridArea && m_namedGridArea == o.m_namedGridArea && m_namedGridAreaRowCount == o.m_namedGridAreaRowCount && m_namedGridAreaColumnCount == o.m_namedGridAreaColumnCount;
     }
 
     bool operator!=(const StyleGridData& o) const
@@ -54,8 +54,8 @@ public:
         return !(*this == o);
     }
 
-    Vector<GridTrackSize> m_gridDefinitionColumns;
-    Vector<GridTrackSize> m_gridDefinitionRows;
+    Vector<GridTrackSize> m_gridTemplateColumns;
+    Vector<GridTrackSize> m_gridTemplateRows;
 
     NamedGridLinesMap m_namedGridColumnLines;
     NamedGridLinesMap m_namedGridRowLines;
diff --git a/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js b/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js
index e638c5b..f4fe542 100644
--- a/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js
+++ b/third_party/WebKit/Source/devtools/front_end/CSSMetadata.js
@@ -661,8 +661,8 @@ WebInspector.CSSMetadata._propertyDataMap = {
     "color": { m: "color", a: "foreground" },
     "counter-increment": { m: "generate" },
     "counter-reset": { m: "generate" },
-    "grid-definition-columns": { m: "grid" },
-    "grid-definition-rows": { m: "grid" },
+    "grid-template-columns": { m: "grid" },
+    "grid-template-rows": { m: "grid" },
     "height": { m: "box" },
     "image-orientation": { m: "images" },
     "left": { m: "visuren" },