Chromium Code Reviews| 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 <style> | 8 <style> |
| 9 .gridItemWithPositiveInteger { | 9 .gridItemWithPositiveInteger { |
| 10 -webkit-grid-start: 10; | 10 -webkit-grid-start: 10; |
| 11 -webkit-grid-before: 15; | 11 -webkit-grid-before: 15; |
| 12 } | 12 } |
| 13 .gridItemWithNegativeInteger { | 13 .gridItemWithNegativeInteger { |
| 14 -webkit-grid-start: -10; | 14 -webkit-grid-start: -10; |
| 15 -webkit-grid-before: -15; | 15 -webkit-grid-before: -15; |
| 16 } | 16 } |
| 17 .gridItemWithBeforeSpan { | |
| 18 -webkit-grid-start: span 2; | |
| 19 -webkit-grid-before: span 8; | |
| 20 } | |
| 21 .gridItemWithAfterSpan { | |
| 22 -webkit-grid-start: 2 span; | |
| 23 -webkit-grid-before: 8 span; | |
| 24 } | |
| 25 .gridItemWithOnlySpan { | |
| 26 -webkit-grid-start: span; | |
| 27 -webkit-grid-before: span; | |
| 28 } | |
| 17 .gridItemWithAuto { | 29 .gridItemWithAuto { |
| 18 -webkit-grid-start: auto; | 30 -webkit-grid-start: auto; |
| 19 -webkit-grid-before: auto; | 31 -webkit-grid-before: auto; |
| 20 } | 32 } |
| 21 </style> | 33 </style> |
| 22 <script src="../js/resources/js-test-pre.js"></script> | 34 <script src="../js/resources/js-test-pre.js"></script> |
| 23 </head> | 35 </head> |
| 24 <body> | 36 <body> |
| 25 <!-- The first has no properties set on it. --> | 37 <!-- The first has no properties set on it. --> |
| 26 <div id="gridElement"></div> | 38 <div id="gridElement"></div> |
| 27 <div class="gridItemWithPositiveInteger" id="gridItemWithPositiveInteger"></div> | 39 <div class="gridItemWithPositiveInteger" id="gridItemWithPositiveInteger"></div> |
| 28 <div class="gridItemWithNegativeInteger" id="gridItemWithNegativeInteger"></div> | 40 <div class="gridItemWithNegativeInteger" id="gridItemWithNegativeInteger"></div> |
| 41 <div class="gridItemWithBeforeSpan" id="gridItemWithBeforeSpan"></div> | |
| 42 <div class="gridItemWithAfterSpan" id="gridItemWithAfterSpan"></div> | |
| 43 <div class="gridItemWithOnlySpan" id="gridItemWithOnlySpan"></div> | |
| 29 <div class="gridItemWithAuto" id="gridItemWithAutoElement"></div> | 44 <div class="gridItemWithAuto" id="gridItemWithAutoElement"></div> |
| 30 <script> | 45 <script> |
| 31 description('Test that setting and getting grid-start and grid-before works as expected'); | 46 description('Test that setting and getting grid-start and grid-before works as expected'); |
| 32 | 47 |
| 33 debug("Test getting -webkit-grid-start and -webkit-grid-before set through C SS"); | 48 debug("Test getting -webkit-grid-start and -webkit-grid-before set through C SS"); |
| 34 var gridElement = document.getElementById("gridElement"); | 49 var gridElement = document.getElementById("gridElement"); |
| 35 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-s tart')", "'auto'"); | 50 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-s tart')", "'auto'"); |
| 36 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-c olumn')", "'auto / auto'"); | 51 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-c olumn')", "'auto / auto'"); |
| 37 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-b efore')", "'auto'"); | 52 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-b efore')", "'auto'"); |
| 38 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-r ow')", "'auto / auto'"); | 53 shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-r ow')", "'auto / auto'"); |
| 39 | 54 |
| 40 var gridItemWithPositiveInteger = document.getElementById("gridItemWithPosit iveInteger"); | 55 var gridItemWithPositiveInteger = document.getElementById("gridItemWithPosit iveInteger"); |
| 41 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-start')", "'10'"); | 56 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-start')", "'10'"); |
| 42 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-column')", "'10 / auto'"); | 57 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-column')", "'10 / auto'"); |
| 43 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-before')", "'15'"); | 58 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-before')", "'15'"); |
| 44 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-row')", "'15 / auto'"); | 59 shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue ('-webkit-grid-row')", "'15 / auto'"); |
| 45 | 60 |
| 46 var gridItemWithNegativeInteger = document.getElementById("gridItemWithNegat iveInteger"); | 61 var gridItemWithNegativeInteger = document.getElementById("gridItemWithNegat iveInteger"); |
| 47 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-start')", "'-10'"); | 62 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-start')", "'-10'"); |
| 48 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-column')", "'-10 / auto'"); | 63 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-column')", "'-10 / auto'"); |
| 49 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-before')", "'-15'"); | 64 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-before')", "'-15'"); |
| 50 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-row')", "'-15 / auto'"); | 65 shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue ('-webkit-grid-row')", "'-15 / auto'"); |
| 51 | 66 |
| 67 var gridItemWithBeforeSpan = document.getElementById("gridItemWithBeforeSpan "); | |
| 68 shouldBe("getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-we bkit-grid-start')", "'span 2'"); | |
| 69 shouldBe("getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-we bkit-grid-column')", "'span 2 / auto'"); | |
| 70 shouldBe("getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-we bkit-grid-before')", "'span 8'"); | |
| 71 shouldBe("getComputedStyle(gridItemWithBeforeSpan, '').getPropertyValue('-we bkit-grid-row')", "'span 8 / auto'"); | |
| 72 | |
| 73 var gridItemWithAfterSpan = document.getElementById("gridItemWithAfterSpan") ; | |
| 74 shouldBe("getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-web kit-grid-start')", "'span 2'"); | |
| 75 shouldBe("getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-web kit-grid-column')", "'span 2 / auto'"); | |
| 76 shouldBe("getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-web kit-grid-before')", "'span 8'"); | |
| 77 shouldBe("getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('-web kit-grid-row')", "'span 8 / auto'"); | |
| 78 | |
| 79 var gridItemWithOnlySpan = document.getElementById("gridItemWithOnlySpan"); | |
| 80 shouldBe("getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webk it-grid-start')", "'span 1'"); | |
| 81 shouldBe("getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webk it-grid-column')", "'span 1 / auto'"); | |
| 82 shouldBe("getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webk it-grid-before')", "'span 1'"); | |
| 83 shouldBe("getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('-webk it-grid-row')", "'span 1 / auto'"); | |
| 84 | |
| 52 var gridItemWithAutoElement = document.getElementById("gridItemWithAutoEleme nt"); | 85 var gridItemWithAutoElement = document.getElementById("gridItemWithAutoEleme nt"); |
| 53 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-start')", "'auto'"); | 86 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-start')", "'auto'"); |
| 54 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-column')", "'auto / auto'"); | 87 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-column')", "'auto / auto'"); |
| 55 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-before')", "'auto'"); | 88 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-before')", "'auto'"); |
| 56 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-row')", "'auto / auto'"); | 89 shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-w ebkit-grid-row')", "'auto / auto'"); |
| 57 | 90 |
| 58 debug(""); | 91 debug(""); |
| 59 debug("Test the initial value"); | 92 debug("Test the initial value"); |
| 60 var element = document.createElement("div"); | 93 var element = document.createElement("div"); |
| 61 document.body.appendChild(element); | 94 document.body.appendChild(element); |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 77 document.body.appendChild(element); | 110 document.body.appendChild(element); |
| 78 element.style.webkitGridStart = "-55"; | 111 element.style.webkitGridStart = "-55"; |
| 79 element.style.webkitGridBefore = "-40"; | 112 element.style.webkitGridBefore = "-40"; |
| 80 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'-55'"); | 113 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'-55'"); |
| 81 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'-55 / auto'"); | 114 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'-55 / auto'"); |
| 82 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'-40'"); | 115 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'-40'"); |
| 83 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'-40 / auto'"); | 116 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'-40 / auto'"); |
| 84 | 117 |
| 85 element = document.createElement("div"); | 118 element = document.createElement("div"); |
| 86 document.body.appendChild(element); | 119 document.body.appendChild(element); |
| 120 element.style.webkitGridStart = "span 3"; | |
| 121 element.style.webkitGridBefore = "span 20"; | |
| 122 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'span 3'"); | |
| 123 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'span 3 / auto'"); | |
| 124 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'span 20'"); | |
| 125 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'span 20 / auto'"); | |
|
ojan
2013/04/11 02:44:47
This, and the other cases where both grid-lines sp
Julien - ping for review
2013/04/17 14:26:27
You are not! I thought we could get away with doin
| |
| 126 | |
| 127 element = document.createElement("div"); | |
| 128 document.body.appendChild(element); | |
| 87 element.style.webkitGridStart = "auto"; | 129 element.style.webkitGridStart = "auto"; |
| 88 element.style.webkitGridBefore = "auto"; | 130 element.style.webkitGridBefore = "auto"; |
| 89 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'auto'"); | 131 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'auto'"); |
| 90 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / auto'"); | 132 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / auto'"); |
| 91 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'auto'"); | 133 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'auto'"); |
| 92 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'"); | 134 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'"); |
| 93 | 135 |
| 94 debug(""); | 136 debug(""); |
| 95 debug("Test setting grid-start and grid-before back to 'auto' through JS"); | 137 debug("Test setting grid-start and grid-before back to 'auto' through JS"); |
| 96 element.style.webkitGridStart = "18"; | 138 element.style.webkitGridStart = "18"; |
| 97 element.style.webkitGridBefore = "66"; | 139 element.style.webkitGridBefore = "66"; |
| 98 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'18'"); | 140 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'18'"); |
| 99 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'18 / auto'"); | 141 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'18 / auto'"); |
| 100 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'66'"); | 142 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'66'"); |
| 101 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'66 / auto'"); | 143 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'66 / auto'"); |
| 102 element.style.webkitGridStart = "auto"; | 144 element.style.webkitGridStart = "auto"; |
| 103 element.style.webkitGridBefore = "auto"; | 145 element.style.webkitGridBefore = "auto"; |
| 104 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'auto'"); | 146 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start ')", "'auto'"); |
| 105 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / auto'"); | 147 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / auto'"); |
| 106 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'auto'"); | 148 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-befor e')", "'auto'"); |
| 107 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'"); | 149 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'"); |
| 108 </script> | 150 </script> |
| 109 <script src="../js/resources/js-test-post.js"></script> | 151 <script src="../js/resources/js-test-post.js"></script> |
| 110 </body> | 152 </body> |
| 111 </html> | 153 </html> |
| OLD | NEW |