Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 08:55:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement a URL-generic type for list-style-image

Browse source 
This should fix the following two "expected to fail" tests:

- getComputedStyle(elem) for url() listStyleImage uses the resolved URL
  and elem.style uses the original URL

- getComputedStyle(elem) for url() listStyle uses the resolved URL
  and elem.style uses the original URL
This commit is contained in:
Fausto Núñez Alberro 2018-02-24 21:44:22 +01:00
parent 8f226f841b
commit cc838f54e5
No known key found for this signature in database
GPG key ID: 475A94D9B398B2DF
26 changed files with 157 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/style/properties/serialization.rs
View file

@ -493,10 +493,9 @@ mod shorthand_serialization {
}
mod list_style {
use style::properties::longhands::list_style_image::SpecifiedValue as ListStyleImage;
use style::properties::longhands::list_style_position::SpecifiedValue as ListStylePosition;
use style::properties::longhands::list_style_type::SpecifiedValue as ListStyleType;
use style::values::Either;
use style::values::generics::url::UrlOrNone as ImageUrlOrNone;
use super::*;
#[test]
@ -504,8 +503,7 @@ mod shorthand_serialization {
let mut properties = Vec::new();
let position = ListStylePosition::Inside;
let image =
ListStyleImage(Either::First(SpecifiedUrl::new_for_testing("http://servo/test.png")));
let image = ImageUrlOrNone::Url(SpecifiedUrl::new_for_testing("http://servo/test.png"));
let style_type = ListStyleType::Disc;
properties.push(PropertyDeclaration::ListStylePosition(position));

10
tests/wpt/mozilla/meta/css/get-computed-style-for-url.html.ini
View file

@ -1,10 +0,0 @@
[get-computed-style-for-url.html]
type: testharness
[getComputedStyle(elem) for url() listStyle uses the resolved URL and elem.style uses the original URL]
expected: FAIL
bug: https://github.com/servo/servo/issues/18015
[getComputedStyle(elem) for url() listStyleImage uses the resolved URL and elem.style uses the original URL]
expected: FAIL
bug: https://github.com/servo/servo/issues/18015

23
tests/wpt/mozilla/tests/css/get-computed-style-for-url.html
View file

@ -40,6 +40,29 @@
}, `getComputedStyle(elem) for url() ${property} uses the resolved URL and elem.style uses the original URL`);
}
function testNoneForProperty(property) {
test(function() {
var elem = document.createElement("div");
elem.style[property] = "none";
container.appendChild(elem);
assert_equals(
getComputedStyle(elem)[computedPropertyName[property] || property],
"none"
);
assert_equals(
elem.style[computedPropertyName[property] || property],
"none"
);
}, `getComputedStyle(elem) and elem.style for url() ${property} correctly return "none"`);
}
testNoneForProperty("background");
testNoneForProperty("backgroundImage");
testNoneForProperty("borderImage");
testNoneForProperty("listStyle");
testNoneForProperty("listStyleImage");
testUrlsForProperty("backgroundImage", "test.jpg");
testUrlsForProperty("background", "test.jpg", "no-repeat");
testUrlsForProperty("borderImage", "test.jpg", "30 round");