| Index: LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
|
| diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
|
| index d1854984194af640fb079caebd2ecc669f7c2f08..51d8d4f0f25d13b4fd8328cb277e833eddf8a771 100755
|
| --- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
|
| +++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
|
| @@ -8,65 +8,65 @@ if (window.testRunner)
|
| <link href="resources/grid.css" rel="stylesheet">
|
| <style>
|
| .gridWithFixed {
|
| - grid-columns: 7px 11px;
|
| - grid-rows: 17px 2px;
|
| + grid-definition-columns: 7px 11px;
|
| + grid-definition-rows: 17px 2px;
|
| }
|
|
|
| .gridWithPercent {
|
| - grid-columns: 53% 99%;
|
| - grid-rows: 27% 52%;
|
| + grid-definition-columns: 53% 99%;
|
| + grid-definition-rows: 27% 52%;
|
| }
|
| .gridWithAuto {
|
| - grid-columns: auto auto;
|
| - grid-rows: auto auto;
|
| + grid-definition-columns: auto auto;
|
| + grid-definition-rows: auto auto;
|
| }
|
| .gridWithEM {
|
| - grid-columns: 10em 12em;
|
| - grid-rows: 15em 17em;
|
| + grid-definition-columns: 10em 12em;
|
| + grid-definition-rows: 15em 17em;
|
| font: 10px Ahem;
|
| }
|
| .gridWithNoneAndAuto {
|
| - grid-columns: none auto;
|
| - grid-rows: none auto;
|
| + grid-definition-columns: none auto;
|
| + grid-definition-rows: none auto;
|
| }
|
| .gridNoneWithAndFixed {
|
| - grid-columns: none 15px;
|
| - grid-rows: none 22px;
|
| + grid-definition-columns: none 15px;
|
| + grid-definition-rows: none 22px;
|
| }
|
| .gridWithThreeItems {
|
| - grid-columns: 15px auto 10em;
|
| - grid-rows: 12em 18px auto;
|
| + grid-definition-columns: 15px auto 10em;
|
| + grid-definition-rows: 12em 18px auto;
|
| font: 10px Ahem;
|
| }
|
| .gridWithPercentAndViewportPercent {
|
| - grid-columns: 50% 15vw;
|
| - grid-rows: 35% 28vh;
|
| + grid-definition-columns: 50% 15vw;
|
| + grid-definition-rows: 35% 28vh;
|
| }
|
| .gridWithFitContentAndFitAvailable {
|
| - grid-columns: -webkit-content-available;
|
| - grid-rows: -webkit-fitcontent -webkit-fit-available;
|
| + grid-definition-columns: -webkit-content-available;
|
| + grid-definition-rows: -webkit-fitcontent -webkit-fit-available;
|
| }
|
| .gridWithMinMaxContent {
|
| - grid-columns: -webkit-min-content -webkit-max-content;
|
| - grid-rows: -webkit-max-content -webkit-min-content;
|
| + grid-definition-columns: -webkit-min-content -webkit-max-content;
|
| + grid-definition-rows: -webkit-max-content -webkit-min-content;
|
| }
|
| .gridWithMinMaxAndFixed {
|
| - grid-columns: minmax(45px, 30%) 15px;
|
| - grid-rows: 12em minmax(35%, 10px);
|
| + grid-definition-columns: minmax(45px, 30%) 15px;
|
| + grid-definition-rows: 12em minmax(35%, 10px);
|
| font: 10px Ahem;
|
| }
|
| .gridWithMinMaxAndMinMaxContent {
|
| - grid-columns: minmax(-webkit-min-content, 30%) 15px;
|
| - grid-rows: 12em minmax(35%, -webkit-max-content);
|
| + grid-definition-columns: minmax(-webkit-min-content, 30%) 15px;
|
| + grid-definition-rows: 12em minmax(35%, -webkit-max-content);
|
| font: 10px Ahem;
|
| }
|
| .gridWithFractionFraction {
|
| - grid-columns: 1fr 2fr;
|
| - grid-rows: 3fr 4fr;
|
| + grid-definition-columns: 1fr 2fr;
|
| + grid-definition-rows: 3fr 4fr;
|
| }
|
| .gridWithFractionMinMax {
|
| - grid-columns: minmax(-webkit-min-content, 45px) 2fr;
|
| - grid-rows: 3fr minmax(14px, -webkit-max-content);
|
| + grid-definition-columns: minmax(-webkit-min-content, 45px) 2fr;
|
| + grid-definition-rows: 3fr minmax(14px, -webkit-max-content);
|
| }
|
| </style>
|
| <script src="../js/resources/js-test-pre.js"></script>
|
|
|