| 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 .gridMaxMaxContent { | 9 .gridMaxMaxContent { |
| 10 grid-definition-columns: minmax(10px, max-content) minmax(10px, 1fr); | 10 grid-template-columns: minmax(10px, max-content) minmax(10px, 1fr); |
| 11 grid-definition-rows: 50px; | 11 grid-template-rows: 50px; |
| 12 } | 12 } |
| 13 | 13 |
| 14 .gridMinMinContent { | 14 .gridMinMinContent { |
| 15 grid-definition-columns: minmax(10px, 1fr) minmax(min-content, 50px); | 15 grid-template-columns: minmax(10px, 1fr) minmax(min-content, 50px); |
| 16 grid-definition-rows: 50px; | 16 grid-template-rows: 50px; |
| 17 } | 17 } |
| 18 | 18 |
| 19 .gridWithIntrinsicSizeBiggerThanFlex { | 19 .gridWithIntrinsicSizeBiggerThanFlex { |
| 20 grid-definition-columns: minmax(min-content, 0.5fr) minmax(18px, 2fr); | 20 grid-template-columns: minmax(min-content, 0.5fr) minmax(18px, 2fr); |
| 21 grid-definition-rows: 50px; | 21 grid-template-rows: 50px; |
| 22 } | 22 } |
| 23 | 23 |
| 24 .gridShrinkBelowItemsIntrinsicSize { | 24 .gridShrinkBelowItemsIntrinsicSize { |
| 25 grid-definition-columns: minmax(0px, 1fr) minmax(0px, 2fr); | 25 grid-template-columns: minmax(0px, 1fr) minmax(0px, 2fr); |
| 26 grid-definition-rows: 50px; | 26 grid-template-rows: 50px; |
| 27 } | 27 } |
| 28 | 28 |
| 29 .gridWithNonFlexingItems { | 29 .gridWithNonFlexingItems { |
| 30 grid-definition-columns: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr
); | 30 grid-template-columns: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr); |
| 31 grid-definition-rows: 50px; | 31 grid-template-rows: 50px; |
| 32 } | 32 } |
| 33 | 33 |
| 34 .firstRowThirdColumn { | 34 .firstRowThirdColumn { |
| 35 grid-column: 3; | 35 grid-column: 3; |
| 36 grid-row: 1; | 36 grid-row: 1; |
| 37 } | 37 } |
| 38 .firstRowFourthColumn { | 38 .firstRowFourthColumn { |
| 39 grid-column: 4; | 39 grid-column: 4; |
| 40 grid-row: 1; | 40 grid-row: 1; |
| 41 } | 41 } |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="1
00" data-expected-height="50"> | 141 <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="1
00" data-expected-height="50"> |
| 142 <div style="display: inline-block; width: 100px;"></div> | 142 <div style="display: inline-block; width: 100px;"></div> |
| 143 </div> | 143 </div> |
| 144 <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="20
0" data-expected-height="50">XXXXXXXXXX XXXXXXXXX</div> | 144 <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="20
0" data-expected-height="50">XXXXXXXXXX XXXXXXXXX</div> |
| 145 <div class="sizedToGridArea firstRowFourthColumn" data-expected-width="6
0" data-expected-height="50"></div> | 145 <div class="sizedToGridArea firstRowFourthColumn" data-expected-width="6
0" data-expected-height="50"></div> |
| 146 </div> | 146 </div> |
| 147 </div> | 147 </div> |
| 148 | 148 |
| 149 </body> | 149 </body> |
| 150 </html> | 150 </html> |
| OLD | NEW |