| OLD | NEW | 
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> | 
| 2 <html> | 2 <html> | 
| 3 <head> | 3 <head> | 
| 4 <script> | 4 <script> | 
| 5 if (window.testRunner) | 5 if (window.testRunner) | 
| 6     testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1); | 6     testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1); | 
| 7 </script> | 7 </script> | 
| 8 <link href="resources/grid.css" rel="stylesheet"> | 8 <link href="resources/grid.css" rel="stylesheet"> | 
| 9 <style> | 9 <style> | 
| 10 .grid { | 10 .grid { | 
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 81     font: 10px Ahem; | 81     font: 10px Ahem; | 
| 82 } | 82 } | 
| 83 .gridWithFractionFraction { | 83 .gridWithFractionFraction { | 
| 84     grid-definition-columns: 2fr 3fr; | 84     grid-definition-columns: 2fr 3fr; | 
| 85     grid-definition-rows: 3fr 5fr; | 85     grid-definition-rows: 3fr 5fr; | 
| 86 } | 86 } | 
| 87 .gridWithFractionMinMax { | 87 .gridWithFractionMinMax { | 
| 88     grid-definition-columns: minmax(min-content, 45px) 2fr; | 88     grid-definition-columns: minmax(min-content, 45px) 2fr; | 
| 89     grid-definition-rows: 3fr minmax(14px, max-content); | 89     grid-definition-rows: 3fr minmax(14px, max-content); | 
| 90 } | 90 } | 
|  | 91 .gridWithCalcCalc { | 
|  | 92     grid-definition-columns: calc(200px) calc(10em); | 
|  | 93     grid-definition-rows: calc(15em) calc(75px); | 
|  | 94     font: 10px Ahem; | 
|  | 95 } | 
|  | 96 .gridWithCalcAndFixed { | 
|  | 97     grid-definition-columns: calc(50%) 8em; | 
|  | 98     grid-definition-rows: 88px calc(25%); | 
|  | 99     font: 10px Ahem; | 
|  | 100 } | 
|  | 101 .gridWithCalcAndMinMax { | 
|  | 102     grid-definition-columns: calc(30px + 20%) minmax(min-content, 80px); | 
|  | 103     grid-definition-rows: minmax(25%, max-content) calc(10% - 7px); | 
|  | 104 } | 
|  | 105 .gridWithCalcInsideMinMax { | 
|  | 106     grid-definition-columns: minmax(calc(23px + 10%), 400px) 12em; | 
|  | 107     grid-definition-rows: calc(150px) minmax(5%, calc(50% - 125px)); | 
|  | 108     font: 10px Ahem; | 
|  | 109 } | 
| 91 </style> | 110 </style> | 
| 92 <script src="../../resources/js-test.js"></script> | 111 <script src="../../resources/js-test.js"></script> | 
| 93 </head> | 112 </head> | 
| 94 <body> | 113 <body> | 
| 95 <div class="grid gridWithFixed" id="gridWithFixedElement"></div> | 114 <div class="grid gridWithFixed" id="gridWithFixedElement"></div> | 
| 96 <div class="grid gridWithPercent" id="gridWithPercentElement"></div> | 115 <div class="grid gridWithPercent" id="gridWithPercentElement"></div> | 
| 97 <div class="grid gridWithAuto" id="gridWithAutoElement"> | 116 <div class="grid gridWithAuto" id="gridWithAutoElement"> | 
| 98     <div class="gridItem2"></div> | 117     <div class="gridItem2"></div> | 
| 99 </div> | 118 </div> | 
| 100 <div class="grid gridWithEM" id="gridWithEMElement"></div> | 119 <div class="grid gridWithEM" id="gridWithEMElement"></div> | 
| 101 <div class="grid gridWithNoneAndAuto" id="gridWithNoneAndAuto"></div> | 120 <div class="grid gridWithNoneAndAuto" id="gridWithNoneAndAuto"></div> | 
| 102 <div class="grid gridWithNoneAndFixed" id="gridWithNoneAndFixed"></div> | 121 <div class="grid gridWithNoneAndFixed" id="gridWithNoneAndFixed"></div> | 
| 103 <div class="grid gridWithThreeItems" id="gridWithThreeItems"></div> | 122 <div class="grid gridWithThreeItems" id="gridWithThreeItems"></div> | 
| 104 <div class="grid gridWithPercentAndViewportPercent" id="gridWithPercentAndViewpo
     rtPercent"></div> | 123 <div class="grid gridWithPercentAndViewportPercent" id="gridWithPercentAndViewpo
     rtPercent"></div> | 
| 105 <div class="grid gridWithFitContentAndFitAvailable" id="gridWithFitContentAndFit
     Available"></div> | 124 <div class="grid gridWithFitContentAndFitAvailable" id="gridWithFitContentAndFit
     Available"></div> | 
| 106 <div class="grid gridWithMinMaxContent" id="gridWithMinMaxContent"></div> | 125 <div class="grid gridWithMinMaxContent" id="gridWithMinMaxContent"></div> | 
| 107 <div class="grid gridWithMinMaxContent" id="gridWithMinMaxContentWithChildrenEle
     ment"> | 126 <div class="grid gridWithMinMaxContent" id="gridWithMinMaxContentWithChildrenEle
     ment"> | 
| 108     <div class="gridItem"></div> | 127     <div class="gridItem"></div> | 
| 109     <div class="gridItem2"></div> | 128     <div class="gridItem2"></div> | 
| 110 </div> | 129 </div> | 
| 111 <div class="grid gridWithMinMaxAndFixed" id="gridWithMinMaxAndFixed"></div> | 130 <div class="grid gridWithMinMaxAndFixed" id="gridWithMinMaxAndFixed"></div> | 
| 112 <div class="grid gridWithMinMaxAndMinMaxContent" id="gridWithMinMaxAndMinMaxCont
     ent"></div> | 131 <div class="grid gridWithMinMaxAndMinMaxContent" id="gridWithMinMaxAndMinMaxCont
     ent"></div> | 
| 113 <div class="grid gridWithFractionFraction" id="gridWithFractionFraction"></div> | 132 <div class="grid gridWithFractionFraction" id="gridWithFractionFraction"></div> | 
| 114 <div class="grid gridWithFractionMinMax" id="gridWithFractionMinMax"></div> | 133 <div class="grid gridWithFractionMinMax" id="gridWithFractionMinMax"></div> | 
|  | 134 <div class="grid gridWithCalcCalc" id="gridWithCalcCalc"></div> | 
|  | 135 <div class="grid gridWithCalcAndFixed" id="gridWithCalcAndFixed"></div> | 
|  | 136 <div class="grid gridWithCalcAndMinMax" id="gridWithCalcAndMinMax"></div> | 
|  | 137 <div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMax"></div> | 
| 115 <script src="resources/grid-definitions-parsing-utils.js"></script> | 138 <script src="resources/grid-definitions-parsing-utils.js"></script> | 
| 116 <script src="resources/grid-columns-rows-get-set-multiple.js"></script> | 139 <script src="resources/grid-columns-rows-get-set-multiple.js"></script> | 
| 117 </body> | 140 </body> | 
| 118 </html> | 141 </html> | 
| OLD | NEW | 
|---|