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

Change SpecifiedUrl::for_cascade to take ServoUrl

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/element.rs
View file

@ -397,7 +397,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
PropertyDeclaration::BackgroundImage(DeclaredValue::Value( PropertyDeclaration::BackgroundImage(DeclaredValue::Value(
background_image::SpecifiedValue(vec![ background_image::SpecifiedValue(vec![
background_image::single_value::SpecifiedValue(Some( 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 { })
)) ))
]))))); ])))));
} }

2
components/style/values/specified/image.rs
View file

@ -45,7 +45,7 @@ impl Image {
/// Creates an already specified image value from an already resolved URL /// Creates an already specified image value from an already resolved URL
/// for insertion in the cascade. /// 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)) Image::Url(SpecifiedUrl::for_cascade(url, extra_data))
} }
} }

4
components/style/values/specified/url.rs
View file

@ -130,10 +130,10 @@ impl SpecifiedUrl {
/// Creates an already specified url value from an already resolved URL /// Creates an already specified url value from an already resolved URL
/// for insertion in the cascade. /// 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 { SpecifiedUrl {
original: None, original: None,
resolved: url, resolved: Some(url),
extra_data: extra_data, extra_data: extra_data,
} }
} }