| OLD | NEW |
| 1 description("Test the setting of the -webkit-image-set function."); | 1 description("Test the setting of the -webkit-image-set function."); |
| 2 | 2 |
| 3 function testComputedStyle(property, fullRule) | 3 function testComputedStyle(property, fullRule) |
| 4 { | 4 { |
| 5 var div = document.createElement("div"); | 5 var div = document.createElement("div"); |
| 6 document.body.appendChild(div); | 6 document.body.appendChild(div); |
| 7 div.setAttribute("style", property + ": " + fullRule); | 7 div.setAttribute("style", property + ": " + fullRule); |
| 8 var computedValue = div.style.backgroundImage; | 8 var computedValue = div.style.backgroundImage; |
| 9 document.body.removeChild(div); | 9 document.body.removeChild(div); |
| 10 return computedValue; | 10 return computedValue; |
| 11 } | 11 } |
| 12 | 12 |
| 13 function testImageSetRule(description, property, rule, expected) | 13 function testImageSetRule(description, rule, expected) |
| 14 { | 14 { |
| 15 debug(""); | 15 debug(""); |
| 16 debug(description + " : " + rule); | 16 debug(description + " : " + rule); |
| 17 | 17 |
| 18 var fullRule = "-webkit-image-set(" + rule + ")"; | 18 var fullRule = '-webkit-image-set(' + rule + ')'; |
| 19 shouldBeEqualToString('testComputedStyle("' + property + '", "' + fullRule +
'")', fullRule); | 19 var call = 'testComputedStyle(`background-image`, `' + fullRule + '`)'; |
| 20 shouldBeEqualToString(call, fullRule); |
| 20 } | 21 } |
| 21 | 22 |
| 22 testImageSetRule("Single value for background-image", | 23 testImageSetRule("Single value for background-image", |
| 23 "background-image", | 24 'url(\"http://www.webkit.org/a\") 1x'); |
| 24 "url(http://www.webkit.org/a) 1x"); | |
| 25 | 25 |
| 26 testImageSetRule("Multiple values for background-image", | 26 testImageSetRule("Multiple values for background-image", |
| 27 "background-image", | 27 'url("http://www.webkit.org/a") 1x, url("http://www.webkit.org/b
") 2x'); |
| 28 "url(http://www.webkit.org/a) 1x, url(http://www.webkit.org/b) 2
x"); | |
| 29 | 28 |
| 30 testImageSetRule("Multiple values for background-image, out of order", | 29 testImageSetRule("Multiple values for background-image, out of order", |
| 31 "background-image", | 30 'url("http://www.webkit.org/c") 3x, url("http://www.webkit.org/b
") 2x, url("http://www.webkit.org/a") 1x'); |
| 32 "url(http://www.webkit.org/c) 3x, url(http://www.webkit.org/b) 2
x, url(http://www.webkit.org/a) 1x"); | |
| 33 | 31 |
| 34 testImageSetRule("Duplicate values for background-image", | 32 testImageSetRule("Duplicate values for background-image", |
| 35 "background-image", | 33 'url("http://www.webkit.org/c") 1x, url("http://www.webkit.org/b
") 2x, url("http://www.webkit.org/a") 1x'); |
| 36 "url(http://www.webkit.org/c) 1x, url(http://www.webkit.org/b) 2
x, url(http://www.webkit.org/a) 1x"); | |
| 37 | 34 |
| 38 testImageSetRule("Fractional values for background-image", | 35 testImageSetRule("Fractional values for background-image", |
| 39 "background-image", | 36 'url("http://www.webkit.org/c") 0.2x, url("http://www.webkit.org
/b") 2.3x, url("http://www.webkit.org/a") 12.3456x'); |
| 40 "url(http://www.webkit.org/c) 0.2x, url(http://www.webkit.org/b)
2.3x, url(http://www.webkit.org/a) 12.3456x"); | |
| 41 | 37 |
| 42 // FIXME: We should also be testing the behavior of negative values somewhere, b
ut it's currently | 38 // FIXME: We should also be testing the behavior of negative values somewhere, b
ut it's currently |
| 43 // broken. http://wkb.ug/100132 | 39 // broken. http://wkb.ug/100132 |
| 44 | 40 |
| 45 successfullyParsed = true; | 41 successfullyParsed = true; |
| OLD | NEW |