| 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 72483ea3946ece2ffb58b69904ffbdfac8080ee1..188128b44b9067fed89c2469afae55659a7060f4 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
|
| @@ -88,6 +88,25 @@ 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="../../resources/js-test.js"></script>
|
| </head>
|
| @@ -112,6 +131,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="gridWithCalcCalc"></div>
|
| +<div class="grid gridWithCalcAndFixed" id="gridWithCalcAndFixed"></div>
|
| +<div class="grid gridWithCalcAndMinMax" id="gridWithCalcAndMinMax"></div>
|
| +<div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMax"></div>
|
| <script src="resources/grid-definitions-parsing-utils.js"></script>
|
| <script src="resources/grid-columns-rows-get-set-multiple.js"></script>
|
| </body>
|
|
|