From 362c6b5249f503bd3c5420a455629a58360aa0ec Mon Sep 17 00:00:00 2001 From: "jfernandez@igalia.com" Date: Thu, 30 Jan 2014 18:09:06 +0000 Subject: 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 --- .../auto-content-resolution-columns.html | 4 +- .../auto-content-resolution-rows.html | 4 +- .../breadth-size-resolution-grid.html | 4 +- .../css-grid-layout/calc-resolution-grid-item.html | 4 +- ...flex-and-minmax-content-resolution-columns.html | 20 +- .../flex-and-minmax-content-resolution-rows.html | 20 +- .../flex-content-resolution-columns.html | 20 +- .../flex-content-resolution-rows.html | 16 +- ...rid-auto-columns-rows-auto-flow-resolution.html | 4 +- .../grid-auto-columns-rows-resolution.html | 4 +- .../grid-auto-columns-rows-update.html | 4 +- .../css-grid-layout/grid-auto-flow-resolution.html | 8 +- .../css-grid-layout/grid-auto-flow-update.html | 4 +- .../grid-columns-rows-get-set-expected.txt | 340 ++++++++++----------- ...grid-columns-rows-get-set-multiple-expected.txt | 226 +++++++------- .../grid-columns-rows-get-set-multiple.html | 72 ++--- .../css-grid-layout/grid-columns-rows-get-set.html | 64 ++-- ...ainer-change-explicit-grid-recompute-child.html | 6 +- ...er-change-named-grid-lines-recompute-child.html | 6 +- .../grid-dynamic-updates-relayout.html | 4 +- .../grid-element-border-grid-item.html | 4 +- .../grid-element-border-padding-grid-item.html | 4 +- ...rid-element-change-columns-repaint-expected.txt | 2 +- .../grid-element-change-columns-repaint.html | 8 +- .../grid-element-change-rows-repaint-expected.txt | 2 +- .../grid-element-change-rows-repaint.html | 8 +- .../grid-element-empty-row-column.html | 4 +- .../grid-element-min-max-height.html | 8 +- .../grid-element-min-max-width.html | 8 +- .../grid-element-padding-grid-item.html | 4 +- .../grid-element-padding-margin.html | 4 +- .../grid-element-repeat-get-set-expected.txt | 62 ++-- .../grid-element-repeat-get-set.html | 44 +-- .../grid-item-addition-auto-placement-update.html | 4 +- .../grid-item-addition-track-breadth-update.html | 4 +- .../grid-item-bad-named-area-auto-placement.html | 4 +- .../grid-item-bad-resolution-double-span.html | 4 +- .../grid-item-change-column-repaint.html | 4 +- .../grid-item-change-order-auto-flow.html | 4 +- .../grid-item-change-row-repaint.html | 4 +- .../fast/css-grid-layout/grid-item-display.html | 4 +- .../grid-item-margin-resolution.html | 4 +- ...id-item-multiple-minmax-content-resolution.html | 4 +- .../grid-item-named-grid-area-resolution.html | 4 +- .../grid-item-named-grid-line-resolution.html | 8 +- ...-negative-integer-explicit-grid-resolution.html | 8 +- .../grid-item-negative-position-resolution.html | 4 +- .../grid-item-order-auto-flow-resolution.html | 4 +- .../grid-item-order-paint-order.html | 4 +- .../grid-item-position-changed-dynamic.html | 8 +- .../grid-item-removal-auto-placement-update.html | 4 +- .../grid-item-removal-track-breadth-update.html | 20 +- .../grid-item-spanning-resolution.html | 8 +- ...cent-height-in-auto-height-grid-resolution.html | 8 +- ...d-item-with-percent-min-max-height-dynamic.html | 6 +- ...rid-item-z-index-stacking-context-expected.html | 4 +- .../grid-item-z-index-stacking-context.html | 4 +- .../grid-preferred-logical-widths.html | 24 +- .../implicit-columns-auto-resolution.html | 4 +- .../implicit-position-dynamic-change.html | 4 +- .../implicit-rows-auto-resolution.html | 4 +- .../fast/css-grid-layout/justify-self-cell.html | 4 +- .../minmax-fixed-logical-height-only.html | 24 +- .../minmax-fixed-logical-width-only.html | 24 +- .../minmax-max-content-resolution-columns.html | 8 +- .../minmax-max-content-resolution-rows.html | 8 +- ...nmax-min-content-column-resolution-columns.html | 8 +- .../minmax-min-content-column-resolution-rows.html | 8 +- .../minmax-spanning-resolution-columns.html | 16 +- .../minmax-spanning-resolution-rows.html | 16 +- .../named-grid-line-get-set-expected.txt | 202 ++++++------ .../css-grid-layout/named-grid-line-get-set.html | 62 ++-- .../non-grid-columns-rows-get-set-expected.txt | 274 ++++++++--------- ...grid-columns-rows-get-set-multiple-expected.txt | 194 ++++++------ .../non-grid-columns-rows-get-set-multiple.html | 72 ++--- .../non-grid-columns-rows-get-set.html | 64 ++-- .../non-grid-element-repeat-get-set-expected.txt | 54 ++-- .../non-grid-element-repeat-get-set.html | 44 +-- .../non-named-grid-line-get-set-expected.txt | 144 ++++----- .../non-named-grid-line-get-set.html | 56 ++-- ...item-in-percent-grid-track-in-percent-grid.html | 4 +- ...ent-grid-item-in-percent-grid-track-update.html | 12 +- .../percent-grid-item-in-percent-grid-track.html | 4 +- ...padding-margin-resolution-grid-item-update.html | 8 +- ...ercent-padding-margin-resolution-grid-item.html | 4 +- .../percent-resolution-grid-item.html | 4 +- .../fast/css-grid-layout/place-cell-by-index.html | 4 +- .../grid-columns-rows-get-set-multiple.js | 42 +-- .../resources/grid-columns-rows-get-set.js | 52 ++-- .../resources/grid-definitions-parsing-utils.js | 22 +- .../non-grid-columns-rows-get-set-multiple.js | 42 +-- .../resources/non-grid-columns-rows-get-set.js | 50 +-- .../scrolled-grid-painting-overflow.html | 4 +- .../css-grid-layout/scrolled-grid-painting.html | 4 +- .../shape-inside-recursive-layout.html | 4 +- 95 files changed, 1354 insertions(+), 1354 deletions(-) (limited to 'third_party/WebKit/LayoutTests/fast') 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) 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) 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) 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) } @@ -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; } -
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.
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); @@ -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; } -
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.
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 @@ 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) @@ -100,9 +100,9 @@ if (window.testRunner) 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) 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) 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) 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) 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) 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) 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) 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) 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; } @@ -93,9 +93,9 @@ 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 @@ @@ -63,9 +63,9 @@ @@ -59,9 +59,9 @@ 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)