| OLD | NEW | 
|---|
| 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> | 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> | 
| 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 <link href="resources/grid.css" rel="stylesheet"> | 8 <link href="resources/grid.css" rel="stylesheet"> | 
| 9 <style> | 9 <style> | 
| 10 .grid { | 10 .grid { | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 69 | 69 | 
| 70 .mixNonRepeatAfterRepeat { | 70 .mixNonRepeatAfterRepeat { | 
| 71     grid-definition-rows: repeat(2, 10px) (end) auto; | 71     grid-definition-rows: repeat(2, 10px) (end) auto; | 
| 72     grid-definition-columns: repeat(2, 250px) 15% (last); | 72     grid-definition-columns: repeat(2, 250px) 15% (last); | 
| 73 } | 73 } | 
| 74 </style> | 74 </style> | 
| 75 <script src="../../resources/js-test.js"></script> | 75 <script src="../../resources/js-test.js"></script> | 
| 76 </head> | 76 </head> | 
| 77 <body> | 77 <body> | 
| 78 <div class="grid singleSingleTrackRepeat" id="singleSingleTrackRepeatWithSize"><
     /div> | 78 <div class="grid singleSingleTrackRepeat" id="singleSingleTrackRepeatWithSize"><
     /div> | 
|  | 79 <div class="indefiniteSizeGrid singleSingleTrackRepeat" id="singleSingleTrackRep
     eatWithoutSize"></div> | 
| 79 <div class="grid twoSingleTrackRepeat" id="twoSingleTrackRepeat"></div> | 80 <div class="grid twoSingleTrackRepeat" id="twoSingleTrackRepeat"></div> | 
| 80 <div class="grid twoSingleTrackRepeat" id="twoSingleTrackRepeatWithChildren"> | 81 <div class="grid twoSingleTrackRepeat" id="twoSingleTrackRepeatWithChildren"> | 
| 81     <div class="gridItem"></div> | 82     <div class="gridItem"></div> | 
| 82     <div class="gridItem2"></div> | 83     <div class="gridItem2"></div> | 
| 83 </div> | 84 </div> | 
| 84 <div class="grid twoDoubleTrackRepeat" id="twoDoubleTrackRepeat"> | 85 <div class="grid twoDoubleTrackRepeat" id="twoDoubleTrackRepeat"> | 
| 85     <div class="gridItem"></div> | 86     <div class="gridItem"></div> | 
| 86     <div class="gridItem2"></div> | 87     <div class="gridItem2"></div> | 
| 87 </div> | 88 </div> | 
| 88 <div class="grid twoDoubleTrackWithNamedGridLineRepeat" id="twoDoubleTrackWithNa
     medGridLineRepeat"> | 89 <div class="grid twoDoubleTrackWithNamedGridLineRepeat" id="twoDoubleTrackWithNa
     medGridLineRepeat"> | 
| 89     <div class="gridItem"></div> | 90     <div class="gridItem"></div> | 
| 90     <div class="gridItem2"></div> | 91     <div class="gridItem2"></div> | 
| 91 </div> | 92 </div> | 
| 92 <div class="grid twoDoubleTrackWithTrailingNamedGridLineRepeat" id="twoDoubleTra
     ckWithTrailingNamedGridLineRepeat"></div> | 93 <div class="grid twoDoubleTrackWithTrailingNamedGridLineRepeat" id="twoDoubleTra
     ckWithTrailingNamedGridLineRepeat"></div> | 
| 93 <div class="grid trailingNamedGridLineRepeat" id="trailingNamedGridLineRepeat"><
     /div> | 94 <div class="grid trailingNamedGridLineRepeat" id="trailingNamedGridLineRepeat"><
     /div> | 
| 94 <div class="grid leadingNamedGridLineRepeat" id="leadingNamedGridLineRepeat"></d
     iv> | 95 <div class="grid leadingNamedGridLineRepeat" id="leadingNamedGridLineRepeat"></d
     iv> | 
| 95 <div class="grid mixRepeatAfterNonRepeat" id="mixRepeatAfterNonRepeat"> | 96 <div class="grid mixRepeatAfterNonRepeat" id="mixRepeatAfterNonRepeat"> | 
| 96     <div class="gridItem"></div> | 97     <div class="gridItem"></div> | 
| 97 </div> | 98 </div> | 
| 98 <div class="grid mixNonRepeatAfterRepeat" id="mixNonRepeatAfterRepeat"></div> | 99 <div class="grid mixNonRepeatAfterRepeat" id="mixNonRepeatAfterRepeat"></div> | 
| 99 | 100 | 
| 100 <script src="resources/grid-definitions-parsing-utils.js"></script> | 101 <script src="resources/grid-definitions-parsing-utils.js"></script> | 
| 101 <script> | 102 <script> | 
| 102     description('Test that setting and getting grid-definition-columns and grid-
     definition-rows with repeat() works as expected'); | 103     description('Test that setting and getting grid-definition-columns and grid-
     definition-rows with repeat() works as expected'); | 
| 103 | 104 | 
| 104     debug("Test getting grid-definition-columns and grid-definition-rows set thr
     ough CSS"); | 105     debug("Test getting grid-definition-columns and grid-definition-rows set thr
     ough CSS"); | 
| 105     testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWi
     thSize"), "120px", "18px"); | 106     testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWi
     thSize"), "120px", "18px"); | 
|  | 107     testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWi
     thoutSize"), "0px", "18px"); | 
| 106     testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "
     400px 400px", "0px 0px"); | 108     testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "
     400px 400px", "0px 0px"); | 
| 107     testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeatWithC
     hildren"), "400px 400px", "44px 77px"); | 109     testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeatWithC
     hildren"), "400px 400px", "44px 77px"); | 
| 108     testGridDefinitionsValues(document.getElementById("twoDoubleTrackRepeat"), "
     33px 120px 0px 120px", "10px 77px 10px 0px"); | 110     testGridDefinitionsValues(document.getElementById("twoDoubleTrackRepeat"), "
     33px 120px 0px 120px", "10px 77px 10px 0px"); | 
| 109     testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithNamedGr
     idLineRepeat"), "33px (middle) 250px (end) 0px (middle) 250px (end)", "10px (sta
     rt) 77px (end) 10px (start) 0px (end)"); | 111     testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithNamedGr
     idLineRepeat"), "33px (middle) 250px (end) 0px (middle) 250px (end)", "10px (sta
     rt) 77px (end) 10px (start) 0px (end)"); | 
| 110     testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithTrailin
     gNamedGridLineRepeat"), "(before) 0px (before) 0px", "(before) 10px (before) 10p
     x"); | 112     testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithTrailin
     gNamedGridLineRepeat"), "(before) 0px (before) 0px", "(before) 10px (before) 10p
     x"); | 
| 111     testGridDefinitionsValues(document.getElementById("trailingNamedGridLineRepe
     at"), "250px (end)", "10px (end)"); | 113     testGridDefinitionsValues(document.getElementById("trailingNamedGridLineRepe
     at"), "250px (end)", "10px (end)"); | 
| 112     testGridDefinitionsValues(document.getElementById("leadingNamedGridLineRepea
     t"), "(start) 250px 250px", "(start) 10px 10px"); | 114     testGridDefinitionsValues(document.getElementById("leadingNamedGridLineRepea
     t"), "(start) 250px 250px", "(start) 10px 10px"); | 
| 113     testGridDefinitionsValues(document.getElementById("mixRepeatAfterNonRepeat")
     , "(start) 140px 250px 250px", "44px 10px 10px"); | 115     testGridDefinitionsValues(document.getElementById("mixRepeatAfterNonRepeat")
     , "(start) 140px 250px 250px", "44px 10px 10px"); | 
| 114     testGridDefinitionsValues(document.getElementById("mixNonRepeatAfterRepeat")
     , "250px 250px 120px (last)", "10px 10px (end) 0px"); | 116     testGridDefinitionsValues(document.getElementById("mixNonRepeatAfterRepeat")
     , "250px 250px 120px (last)", "10px 10px (end) 0px"); | 
| 115 | 117 | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 126     testInvalidSyntax("repeat()"); | 128     testInvalidSyntax("repeat()"); | 
| 127     testInvalidSyntax("repeat(3 / auto)"); | 129     testInvalidSyntax("repeat(3 / auto)"); | 
| 128     testInvalidSyntax("repeat(3 , ,)"); | 130     testInvalidSyntax("repeat(3 , ,)"); | 
| 129     testInvalidSyntax("repeat(0, 15px)"); | 131     testInvalidSyntax("repeat(0, 15px)"); | 
| 130     testInvalidSyntax("repeat(-1, auto)"); | 132     testInvalidSyntax("repeat(-1, auto)"); | 
| 131     // Nesting is no allowed. | 133     // Nesting is no allowed. | 
| 132     testInvalidSyntax("repeat(2, repeat(1, auto))"); | 134     testInvalidSyntax("repeat(2, repeat(1, auto))"); | 
| 133 </script> | 135 </script> | 
| 134 </body> | 136 </body> | 
| 135 </html> | 137 </html> | 
| OLD | NEW | 
|---|