| 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 1829777e8e757f9eab1c96713c83419723a5a657..87083827ae60c0a7a75fd0bba39248386bca140c 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
|
| @@ -7,6 +7,11 @@ if (window.testRunner)
|
| </script>
|
| <link href="resources/grid.css" rel="stylesheet">
|
| <style>
|
| +div {
|
| + width: 800px;
|
| + height: 600px;
|
| +}
|
| +
|
| .gridWithFixed {
|
| grid-definition-columns: 7px 11px;
|
| grid-definition-rows: 17px 2px;
|
| @@ -68,6 +73,26 @@ if (window.testRunner)
|
| grid-definition-columns: minmax(min-content, 45px) 2fr;
|
| grid-definition-rows: 3fr minmax(14px, max-content);
|
| }
|
| +.gridWithCalcCalc {
|
| + grid-definition-columns: calc(200px) calc(10em);
|
| + grid-definition-rows: calc(15em) calc(75px);
|
| + font: 10px Ahem;
|
| +}
|
| +.gridWithCalcAndFixed {
|
| + grid-definition-columns: calc(50%) 8em;
|
| + grid-definition-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);
|
| +}
|
| +.gridWithCalcInsideMinMax {
|
| + grid-definition-columns: minmax(calc(23px + 10%), 400px) 12em;
|
| + grid-definition-rows: calc(150px) minmax(5%, calc(50% - 125px));
|
| + font: 10px Ahem;
|
| +}
|
| +
|
| </style>
|
| <script src="../js/resources/js-test-pre.js"></script>
|
| </head>
|
| @@ -86,6 +111,10 @@ if (window.testRunner)
|
| <div class="grid gridWithMinMaxAndMinMaxContent" id="gridWithMinMaxAndMinMaxContent"></div>
|
| <div class="grid gridWithFractionFraction" id="gridWithFractionFraction"></div>
|
| <div class="grid gridWithFractionMinMax" id="gridWithFractionMinMax"></div>
|
| +<div class="grid gridWithCalcCalc" id="gridWithCalcCalcElement"></div>
|
| +<div class="grid gridWithCalcAndFixed" id="gridWithCalcAndFixedElement"></div>
|
| +<div class="grid gridWithCalcAndMinMax" id="gridWithCalcAndMinMaxElement"></div>
|
| +<div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div>
|
| <script src="resources/grid-definitions-parsing-utils.js"></script>
|
| <script src="resources/grid-columns-rows-get-set-multiple.js"></script>
|
| <script src="../js/resources/js-test-post.js"></script>
|
|
|