mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
style: Have from_image_request reuse ImageValue from image request directly.
And also remove ComputedImageUrl::from_url_value_data. Bug: 1461858 Reviewed-by: emilio MozReview-Commit-ID: 5zifQlU7tOz
This commit is contained in:
parent
45a37503af
commit
5b0903e604
2 changed files with 7 additions and 14 deletions
|
@ -426,9 +426,10 @@ impl nsStyleImage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe fn get_image_url(self: &nsStyleImage) -> ComputedImageUrl {
|
unsafe fn get_image_url(&self) -> ComputedImageUrl {
|
||||||
let url_value = bindings::Gecko_GetURLValue(self);
|
let image_request = bindings::Gecko_GetImageRequest(self)
|
||||||
ComputedImageUrl::from_url_value_data(url_value.as_ref().unwrap())
|
.as_ref().expect("Null image request?");
|
||||||
|
ComputedImageUrl::from_image_request(image_request)
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe fn get_gradient(self: &nsStyleImage) -> Box<Gradient> {
|
unsafe fn get_gradient(self: &nsStyleImage) -> Box<Gradient> {
|
||||||
|
|
|
@ -309,18 +309,10 @@ impl ToCss for ComputedImageUrl {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ComputedImageUrl {
|
impl ComputedImageUrl {
|
||||||
/// Convert from URLValueData to SpecifiedUrl.
|
|
||||||
pub unsafe fn from_url_value_data(url: &URLValueData) -> Self {
|
|
||||||
ComputedImageUrl(
|
|
||||||
SpecifiedImageUrl::from_css_url(CssUrl::from_url_value_data(url))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Convert from nsStyleImageReques to ComputedImageUrl.
|
/// Convert from nsStyleImageReques to ComputedImageUrl.
|
||||||
pub unsafe fn from_image_request(image_request: &nsStyleImageRequest) -> Self {
|
pub unsafe fn from_image_request(image_request: &nsStyleImageRequest) -> Self {
|
||||||
let image_value = image_request.mImageValue.mRawPtr
|
let image_value = image_request.mImageValue.to_safe();
|
||||||
.as_ref().expect("mImageValue is null");
|
let url = CssUrl::from_url_value_data(&image_value._base);
|
||||||
let url_value_data = &image_value._base;
|
ComputedImageUrl(SpecifiedImageUrl { url, image_value })
|
||||||
Self::from_url_value_data(url_value_data)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue