| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <script> | 3 <script> |
| 4 if (window.testRunner) | 4 if (window.testRunner) |
| 5 testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1); | 5 testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1); |
| 6 </script> | 6 </script> |
| 7 <link href="resources/grid.css" rel="stylesheet"> | 7 <link href="resources/grid.css" rel="stylesheet"> |
| 8 <style> | 8 <style> |
| 9 .gridMinMinContent { | 9 .gridMinMinContent { |
| 10 grid-definition-columns: minmax(min-content, 40px); | 10 grid-template-columns: minmax(min-content, 40px); |
| 11 grid-definition-rows: 50px; | 11 grid-template-rows: 50px; |
| 12 } | 12 } |
| 13 | 13 |
| 14 .gridMaxMinContent { | 14 .gridMaxMinContent { |
| 15 grid-definition-columns: minmax(30px, min-content); | 15 grid-template-columns: minmax(30px, min-content); |
| 16 grid-definition-rows: 20px; | 16 grid-template-rows: 20px; |
| 17 } | 17 } |
| 18 | 18 |
| 19 .firstRowFirstColumn { | 19 .firstRowFirstColumn { |
| 20 font: 10px/1 Ahem; | 20 font: 10px/1 Ahem; |
| 21 /* Make us fit our grid area. */ | 21 /* Make us fit our grid area. */ |
| 22 width: 100%; | 22 width: 100%; |
| 23 height: 100%; | 23 height: 100%; |
| 24 } | 24 } |
| 25 </style> | 25 </style> |
| 26 <script src="../../resources/check-layout.js"></script> | 26 <script src="../../resources/check-layout.js"></script> |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 <div style="width: 100px; height: 20px"> | 90 <div style="width: 100px; height: 20px"> |
| 91 <div class="grid gridMaxMinContent"> | 91 <div class="grid gridMaxMinContent"> |
| 92 <!-- The 'max' logical width ends up being smaller than the 'min' so per
the spec we ignore the 'max'. --> | 92 <!-- The 'max' logical width ends up being smaller than the 'min' so per
the spec we ignore the 'max'. --> |
| 93 <div class="firstRowFirstColumn" data-expected-width="30" data-expected-
height="20">XX XX XX XX XX XX</div> | 93 <div class="firstRowFirstColumn" data-expected-width="30" data-expected-
height="20">XX XX XX XX XX XX</div> |
| 94 </div> | 94 </div> |
| 95 </div> | 95 </div> |
| 96 | 96 |
| 97 </body> | 97 </body> |
| 98 </html> | 98 </html> |
| OLD | NEW |