Change SpecifiedUrl::for_cascade to take ServoUrl

This commit is contained in:
Xidorn Quan 2016-12-21 10:14:04 +11:00
parent 56f236724c
commit fed488cd01
3 changed files with 4 additions and 4 deletions

View file

@ -397,7 +397,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
PropertyDeclaration::BackgroundImage(DeclaredValue::Value(
background_image::SpecifiedValue(vec![
background_image::single_value::SpecifiedValue(Some(
specified::Image::for_cascade(Some(url.into()), specified::url::UrlExtraData { })
specified::Image::for_cascade(url.into(), specified::url::UrlExtraData { })
))
])))));
}

View file

@ -45,7 +45,7 @@ impl Image {
/// Creates an already specified image value from an already resolved URL
/// for insertion in the cascade.
pub fn for_cascade(url: Option<ServoUrl>, extra_data: UrlExtraData) -> Self {
pub fn for_cascade(url: ServoUrl, extra_data: UrlExtraData) -> Self {
Image::Url(SpecifiedUrl::for_cascade(url, extra_data))
}
}

View file

@ -130,10 +130,10 @@ impl SpecifiedUrl {
/// Creates an already specified url value from an already resolved URL
/// for insertion in the cascade.
pub fn for_cascade(url: Option<ServoUrl>, extra_data: UrlExtraData) -> Self {
pub fn for_cascade(url: ServoUrl, extra_data: UrlExtraData) -> Self {
SpecifiedUrl {
original: None,
resolved: url,
resolved: Some(url),
extra_data: extra_data,
}
}