| 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 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel
     =stylesheet> | 9 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel
     =stylesheet> | 
| 10 <style> | 10 <style> | 
| 11 .gridMinContentFixed { | 11 .gridMinContentFixed { | 
| 12     grid-definition-columns: minmax(min-content, 40px) minmax(min-content, 40px)
     ; | 12     grid-template-columns: minmax(min-content, 40px) minmax(min-content, 40px); | 
| 13     grid-definition-rows: 10px; | 13     grid-template-rows: 10px; | 
| 14     font: 10px/1 Ahem; | 14     font: 10px/1 Ahem; | 
| 15 } | 15 } | 
| 16 | 16 | 
| 17 .gridFixedMinContent { | 17 .gridFixedMinContent { | 
| 18     grid-definition-columns: minmax(30px, min-content) minmax(30px, min-content)
     ; | 18     grid-template-columns: minmax(30px, min-content) minmax(30px, min-content); | 
| 19     grid-definition-rows: 10px; | 19     grid-template-rows: 10px; | 
| 20     font: 10px/1 Ahem; | 20     font: 10px/1 Ahem; | 
| 21 } | 21 } | 
| 22 | 22 | 
| 23 .gridFixedMaxContent { | 23 .gridFixedMaxContent { | 
| 24     grid-definition-columns: minmax(40px, max-content) minmax(40px, max-content)
     ; | 24     grid-template-columns: minmax(40px, max-content) minmax(40px, max-content); | 
| 25     grid-definition-rows: 10px; | 25     grid-template-rows: 10px; | 
| 26     font: 10px/1 Ahem; | 26     font: 10px/1 Ahem; | 
| 27 } | 27 } | 
| 28 | 28 | 
| 29 .gridFixedFixed { | 29 .gridFixedFixed { | 
| 30     grid-definition-columns: minmax(30px, 40px) minmax(30px, 40px); | 30     grid-template-columns: minmax(30px, 40px) minmax(30px, 40px); | 
| 31     grid-definition-rows: 10px; | 31     grid-template-rows: 10px; | 
| 32 } | 32 } | 
| 33 | 33 | 
| 34 .gridAutoContent { | 34 .gridAutoContent { | 
| 35     grid-definition-columns: auto auto; | 35     grid-template-columns: auto auto; | 
| 36     grid-definition-rows: 10px; | 36     grid-template-rows: 10px; | 
| 37     font: 10px/1 Ahem; | 37     font: 10px/1 Ahem; | 
| 38 } | 38 } | 
| 39 | 39 | 
| 40 .gridFixedFraction { | 40 .gridFixedFraction { | 
| 41     grid-definition-columns: minmax(10px, 1fr) minmax(2fr, 20px); | 41     grid-template-columns: minmax(10px, 1fr) minmax(2fr, 20px); | 
| 42     grid-definition-rows: 10px; | 42     grid-template-rows: 10px; | 
| 43 } | 43 } | 
| 44 | 44 | 
| 45 .margins { | 45 .margins { | 
| 46     margin: 10px 20px 30px 40px; | 46     margin: 10px 20px 30px 40px; | 
| 47 } | 47 } | 
| 48 </style> | 48 </style> | 
| 49 </head> | 49 </head> | 
| 50 <script src="../../resources/check-layout.js"></script> | 50 <script src="../../resources/check-layout.js"></script> | 
| 51 <body onload="checkLayout('.grid')"> | 51 <body onload="checkLayout('.grid')"> | 
| 52 <body> | 52 <body> | 
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 131     <div class="firstRowFirstColumn">XX XX XX</div> | 131     <div class="firstRowFirstColumn">XX XX XX</div> | 
| 132     <div class="firstRowBothColumn">XX XX XX</div> | 132     <div class="firstRowBothColumn">XX XX XX</div> | 
| 133 </div> | 133 </div> | 
| 134 <div class="grid gridAutoContent max-content" data-expected-height="10" data-exp
     ected-width="120"> | 134 <div class="grid gridAutoContent max-content" data-expected-height="10" data-exp
     ected-width="120"> | 
| 135     <div class="firstRowBothColumn">XX XX XX</div> | 135     <div class="firstRowBothColumn">XX XX XX</div> | 
| 136     <div class="firstRowSecondColumn">XX XX XX</div> | 136     <div class="firstRowSecondColumn">XX XX XX</div> | 
| 137 </div> | 137 </div> | 
| 138 | 138 | 
| 139 </body> | 139 </body> | 
| 140 </html> | 140 </html> | 
| OLD | NEW | 
|---|