| 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-end: 10; | 10 -webkit-grid-end: 10; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 -webkit-grid-after: 9 span; | 23 -webkit-grid-after: 9 span; |
| 24 } | 24 } |
| 25 .gridItemWithOnlySpan { | 25 .gridItemWithOnlySpan { |
| 26 -webkit-grid-end: span; | 26 -webkit-grid-end: span; |
| 27 -webkit-grid-after: span; | 27 -webkit-grid-after: span; |
| 28 } | 28 } |
| 29 .gridItemWithAuto { | 29 .gridItemWithAuto { |
| 30 -webkit-grid-end: auto; | 30 -webkit-grid-end: auto; |
| 31 -webkit-grid-after: auto; | 31 -webkit-grid-after: auto; |
| 32 } | 32 } |
| 33 .gridItemWithString { |
| 34 -webkit-grid-end: "first"; |
| 35 -webkit-grid-after: "last"; |
| 36 } |
| 37 .gridItemWithSpanString { |
| 38 -webkit-grid-end: "first" span; |
| 39 -webkit-grid-after: span "last"; |
| 40 } |
| 41 .gridItemWithSpanNumberString { |
| 42 -webkit-grid-end: 2 "first" span; |
| 43 -webkit-grid-after: "last" 3 span; |
| 44 } |
| 33 </style> | 45 </style> |
| 34 <script src="resources/grid-item-column-row-parsing-utils.js"></script> | 46 <script src="resources/grid-item-column-row-parsing-utils.js"></script> |
| 35 <script src="../js/resources/js-test-pre.js"></script> | 47 <script src="../js/resources/js-test-pre.js"></script> |
| 36 </head> | 48 </head> |
| 37 <body> | 49 <body> |
| 38 <!-- The first has no properties set on it. --> | 50 <!-- The first has no properties set on it. --> |
| 39 <div id="gridElement"></div> | 51 <div id="gridElement"></div> |
| 40 <div class="gridItemWithPositiveInteger" id="gridItemWithPositiveInteger"></div> | 52 <div class="gridItemWithPositiveInteger" id="gridItemWithPositiveInteger"></div> |
| 41 <div class="gridItemWithNegativeInteger" id="gridItemWithNegativeInteger"></div> | 53 <div class="gridItemWithNegativeInteger" id="gridItemWithNegativeInteger"></div> |
| 42 <div class="gridItemWithBeforeSpan" id="gridItemWithBeforeSpan"></div> | 54 <div class="gridItemWithBeforeSpan" id="gridItemWithBeforeSpan"></div> |
| 43 <div class="gridItemWithAfterSpan" id="gridItemWithAfterSpan"></div> | 55 <div class="gridItemWithAfterSpan" id="gridItemWithAfterSpan"></div> |
| 44 <div class="gridItemWithOnlySpan" id="gridItemWithOnlySpan"></div> | 56 <div class="gridItemWithOnlySpan" id="gridItemWithOnlySpan"></div> |
| 45 <div class="gridItemWithAuto" id="gridItemWithAutoElement"></div> | 57 <div class="gridItemWithAuto" id="gridItemWithAutoElement"></div> |
| 58 <div class="gridItemWithString" id="gridItemWithStringElement"></div> |
| 59 <div class="gridItemWithSpanString" id="gridItemWithSpanStringElement"></div> |
| 60 <div class="gridItemWithSpanNumberString" id="gridItemWithSpanNumberStringElemen
t"></div> |
| 46 <script> | 61 <script> |
| 47 description('Test that setting and getting grid-end and grid-after works as
expected'); | 62 description('Test that setting and getting grid-end and grid-after works as
expected'); |
| 48 | 63 |
| 49 debug("Test getting -webkit-grid-end and -webkit-grid-after set through CSS"
); | 64 debug("Test getting -webkit-grid-end and -webkit-grid-after set through CSS"
); |
| 50 testColumnRowCSSParsing("gridElement", "auto / auto", "auto / auto"); | 65 testColumnRowCSSParsing("gridElement", "auto / auto", "auto / auto"); |
| 51 testColumnRowCSSParsing("gridItemWithPositiveInteger", "auto / 10", "auto /
15"); | 66 testColumnRowCSSParsing("gridItemWithPositiveInteger", "auto / 10", "auto /
15"); |
| 52 testColumnRowCSSParsing("gridItemWithNegativeInteger", "auto / -10", "auto /
-15"); | 67 testColumnRowCSSParsing("gridItemWithNegativeInteger", "auto / -10", "auto /
-15"); |
| 53 testColumnRowCSSParsing("gridItemWithBeforeSpan", "auto / span 2", "auto / s
pan 9"); | 68 testColumnRowCSSParsing("gridItemWithBeforeSpan", "auto / span 2", "auto / s
pan 9"); |
| 54 testColumnRowCSSParsing("gridItemWithAfterSpan", "auto / span 2", "auto / sp
an 9"); | 69 testColumnRowCSSParsing("gridItemWithAfterSpan", "auto / span 2", "auto / sp
an 9"); |
| 55 testColumnRowCSSParsing("gridItemWithOnlySpan", "auto / span 1", "auto / spa
n 1"); | 70 testColumnRowCSSParsing("gridItemWithOnlySpan", "auto / span 1", "auto / spa
n 1"); |
| 56 testColumnRowCSSParsing("gridItemWithAutoElement", "auto / auto", "auto / au
to"); | 71 testColumnRowCSSParsing("gridItemWithAutoElement", "auto / auto", "auto / au
to"); |
| 72 testColumnRowCSSParsing("gridItemWithStringElement", "auto / 1 first", "auto
/ 1 last"); |
| 73 testColumnRowCSSParsing("gridItemWithSpanStringElement", "auto / span 1 firs
t", "auto / span 1 last"); |
| 74 testColumnRowCSSParsing("gridItemWithSpanNumberStringElement", "auto / span
2 first", "auto / span 3 last"); |
| 57 | 75 |
| 58 debug(""); | 76 debug(""); |
| 59 debug("Test the initial value"); | 77 debug("Test the initial value"); |
| 60 var element = document.createElement("div"); | 78 var element = document.createElement("div"); |
| 61 document.body.appendChild(element); | 79 document.body.appendChild(element); |
| 62 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')
", "'auto'"); | 80 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')
", "'auto'"); |
| 63 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum
n')", "'auto / auto'"); | 81 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum
n')", "'auto / auto'"); |
| 64 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after
')", "'auto'"); | 82 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after
')", "'auto'"); |
| 65 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')
", "'auto / auto'"); | 83 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')
", "'auto / auto'"); |
| 66 | 84 |
| 67 debug(""); | 85 debug(""); |
| 68 debug("Test getting and setting grid-end and grid-after through JS"); | 86 debug("Test getting and setting grid-end and grid-after through JS"); |
| 69 testEndAfterJSParsing("18", "66"); | 87 testEndAfterJSParsing("18", "66"); |
| 70 testEndAfterJSParsing("-55", "-40"); | 88 testEndAfterJSParsing("-55", "-40"); |
| 89 testEndAfterJSParsing("'first'", "'last'", "1 first", "1 last"); |
| 71 testEndAfterJSParsing("span 7", "span 2"); | 90 testEndAfterJSParsing("span 7", "span 2"); |
| 91 testEndAfterJSParsing("span 'first'", "span 'last'", "span 1 first", "span 1
last"); |
| 72 testEndAfterJSParsing("auto", "auto"); | 92 testEndAfterJSParsing("auto", "auto"); |
| 73 | 93 |
| 74 debug(""); | 94 debug(""); |
| 75 debug("Test setting grid-start and grid-before to 'inherit' through JS"); | 95 debug("Test setting grid-start and grid-before to 'inherit' through JS"); |
| 76 testEndAfterInheritJSParsing("inherit", "18"); | 96 testEndAfterInheritJSParsing("inherit", "18"); |
| 77 testEndAfterInheritJSParsing("2", "inherit"); | 97 testEndAfterInheritJSParsing("2", "inherit"); |
| 78 testEndAfterInheritJSParsing("inherit", "inherit"); | 98 testEndAfterInheritJSParsing("inherit", "inherit"); |
| 79 | 99 |
| 80 debug(""); | 100 debug(""); |
| 81 debug("Test setting grid-start and grid-before to 'initial' through JS"); | 101 debug("Test setting grid-start and grid-before to 'initial' through JS"); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 92 element.style.webkitGridEnd = "auto"; | 112 element.style.webkitGridEnd = "auto"; |
| 93 element.style.webkitGridAfter = "auto"; | 113 element.style.webkitGridAfter = "auto"; |
| 94 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')
", "'auto'"); | 114 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')
", "'auto'"); |
| 95 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum
n')", "'auto / auto'"); | 115 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum
n')", "'auto / auto'"); |
| 96 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after
')", "'auto'"); | 116 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after
')", "'auto'"); |
| 97 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')
", "'auto / auto'"); | 117 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')
", "'auto / auto'"); |
| 98 </script> | 118 </script> |
| 99 <script src="../js/resources/js-test-post.js"></script> | 119 <script src="../js/resources/js-test-post.js"></script> |
| 100 </body> | 120 </body> |
| 101 </html> | 121 </html> |
| OLD | NEW |