| 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 .grid { | 9 .grid { |
| 10 width: 100px; | 10 width: 100px; |
| 11 height: 200px; | 11 height: 200px; |
| 12 } | 12 } |
| 13 | 13 |
| 14 #grid1 { | 14 #grid1 { |
| 15 grid-definition-columns: minmax(20px, 80px) 60px; | 15 grid-template-columns: minmax(20px, 80px) 60px; |
| 16 grid-definition-rows: 30px; | 16 grid-template-rows: 30px; |
| 17 } | 17 } |
| 18 | 18 |
| 19 #grid2 { | 19 #grid2 { |
| 20 /* First minmax more constraining than available logical width. */ | 20 /* First minmax more constraining than available logical width. */ |
| 21 grid-definition-columns: minmax(50%, 60px) minmax(10px, 40%); | 21 grid-template-columns: minmax(50%, 60px) minmax(10px, 40%); |
| 22 grid-definition-rows: 30px; | 22 grid-template-rows: 30px; |
| 23 } | 23 } |
| 24 | 24 |
| 25 #grid3 { | 25 #grid3 { |
| 26 /* Overlapping range. */ | 26 /* Overlapping range. */ |
| 27 grid-definition-columns: minmax(10px, 80px) minmax(20px, 50px); | 27 grid-template-columns: minmax(10px, 80px) minmax(20px, 50px); |
| 28 grid-definition-rows: 30px; | 28 grid-template-rows: 30px; |
| 29 } | 29 } |
| 30 | 30 |
| 31 #grid4 { | 31 #grid4 { |
| 32 grid-definition-columns: minmax(20px, 80px) 160px; | 32 grid-template-columns: minmax(20px, 80px) 160px; |
| 33 grid-definition-rows: 30px; | 33 grid-template-rows: 30px; |
| 34 -webkit-writing-mode: vertical-rl; | 34 -webkit-writing-mode: vertical-rl; |
| 35 } | 35 } |
| 36 | 36 |
| 37 #grid5 { | 37 #grid5 { |
| 38 /* 50% > 80px, 80px should be ignored. */ | 38 /* 50% > 80px, 80px should be ignored. */ |
| 39 grid-definition-columns: minmax(50%, 80px) minmax(10px, 60%); | 39 grid-template-columns: minmax(50%, 80px) minmax(10px, 60%); |
| 40 grid-definition-rows: 30px; | 40 grid-template-rows: 30px; |
| 41 -webkit-writing-mode: vertical-lr; | 41 -webkit-writing-mode: vertical-lr; |
| 42 } | 42 } |
| 43 | 43 |
| 44 #grid6 { | 44 #grid6 { |
| 45 /* Overlapping range. */ | 45 /* Overlapping range. */ |
| 46 grid-definition-columns: minmax(10px, 180px) minmax(30px, 150px); | 46 grid-template-columns: minmax(10px, 180px) minmax(30px, 150px); |
| 47 grid-definition-rows: 30px; | 47 grid-template-rows: 30px; |
| 48 -webkit-writing-mode: horizontal-bt; | 48 -webkit-writing-mode: horizontal-bt; |
| 49 } | 49 } |
| 50 | 50 |
| 51 .firstRowFirstColumn { | 51 .firstRowFirstColumn { |
| 52 width: 100%; | 52 width: 100%; |
| 53 height: 100%; | 53 height: 100%; |
| 54 } | 54 } |
| 55 | 55 |
| 56 .firstRowSecondColumn { | 56 .firstRowSecondColumn { |
| 57 width: 100%; | 57 width: 100%; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 <div class="firstRowSecondColumn" data-expected-height="100" data-expected-w
idth="30"></div> | 89 <div class="firstRowSecondColumn" data-expected-height="100" data-expected-w
idth="30"></div> |
| 90 </div> | 90 </div> |
| 91 | 91 |
| 92 <div class="grid" id="grid6" data-expected-width="100" data-expected-height="200
"> | 92 <div class="grid" id="grid6" data-expected-width="100" data-expected-height="200
"> |
| 93 <div class="firstRowFirstColumn" data-expected-height="30" data-expected-wid
th="40"></div> | 93 <div class="firstRowFirstColumn" data-expected-height="30" data-expected-wid
th="40"></div> |
| 94 <div class="firstRowSecondColumn" data-expected-height="30" data-expected-wi
dth="60"></div> | 94 <div class="firstRowSecondColumn" data-expected-height="30" data-expected-wi
dth="60"></div> |
| 95 </div> | 95 </div> |
| 96 | 96 |
| 97 </body> | 97 </body> |
| 98 </html> | 98 </html> |
| OLD | NEW |