| 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 grid-definition-columns: 50px 100px; | 10 grid-template-columns: 50px 100px; |
| 11 grid-definition-rows: 70px 140px; | 11 grid-template-rows: 70px 140px; |
| 12 } | 12 } |
| 13 | 13 |
| 14 #minHeightPercent { | 14 #minHeightPercent { |
| 15 height: 10px; | 15 height: 10px; |
| 16 min-height: 50%; | 16 min-height: 50%; |
| 17 } | 17 } |
| 18 | 18 |
| 19 #maxHeightPercent { | 19 #maxHeightPercent { |
| 20 height: 100px; | 20 height: 100px; |
| 21 max-height: 50%; | 21 max-height: 50%; |
| 22 } | 22 } |
| 23 </style> | 23 </style> |
| 24 <script src="../../resources/check-layout.js"></script> | 24 <script src="../../resources/check-layout.js"></script> |
| 25 <script> | 25 <script> |
| 26 function testLayout(gridElementID, gridTracks, size) | 26 function testLayout(gridElementID, gridTracks, size) |
| 27 { | 27 { |
| 28 var gridElement = document.getElementById(gridElementID); | 28 var gridElement = document.getElementById(gridElementID); |
| 29 gridElement.style.gridDefinitionRows = gridTracks.rows; | 29 gridElement.style.gridTemplateRows = gridTracks.rows; |
| 30 var gridItem = gridElement.firstChild.nextSibling; | 30 var gridItem = gridElement.firstChild.nextSibling; |
| 31 gridItem.setAttribute("data-expected-width", size.width); | 31 gridItem.setAttribute("data-expected-width", size.width); |
| 32 gridItem.setAttribute("data-expected-height", size.height); | 32 gridItem.setAttribute("data-expected-height", size.height); |
| 33 checkLayout("#" + gridElementID) | 33 checkLayout("#" + gridElementID) |
| 34 } | 34 } |
| 35 | 35 |
| 36 function runTests() | 36 function runTests() |
| 37 { | 37 { |
| 38 testLayout("gridWithMinHeightItem", { "rows": "70px 140px" }, { "width": "50
px", "height": "35px" }); | 38 testLayout("gridWithMinHeightItem", { "rows": "70px 140px" }, { "width": "50
px", "height": "35px" }); |
| 39 testLayout("gridWithMinHeightItem", { "rows": "100px 140px" }, { "width": "5
0px", "height": "50px" }); | 39 testLayout("gridWithMinHeightItem", { "rows": "100px 140px" }, { "width": "5
0px", "height": "50px" }); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 55 <div id="gridWithMinHeightItem" class="grid"> | 55 <div id="gridWithMinHeightItem" class="grid"> |
| 56 <div id="minHeightPercent"></div> | 56 <div id="minHeightPercent"></div> |
| 57 </div> | 57 </div> |
| 58 | 58 |
| 59 <div id="gridWithMaxHeightItem" class="grid"> | 59 <div id="gridWithMaxHeightItem" class="grid"> |
| 60 <div id="maxHeightPercent"></div> | 60 <div id="maxHeightPercent"></div> |
| 61 </div> | 61 </div> |
| 62 | 62 |
| 63 </body> | 63 </body> |
| 64 </html> | 64 </html> |
| OLD | NEW |