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

style: Make from_image_request infallible.

Browse source 
All callsites already assert, so moving the assertion into the method
should be fine. It is not expected to handle a null image value anyway.

Bug: 1461858
Reviewed-by: emilio
MozReview-Commit-ID: J8CA8m22eSv
This commit is contained in:
Xidorn Quan 2018-05-16 13:39:58 +10:00 • committed by Emilio Cobos Álvarez
parent dc2aadd43a
commit 45a37503af
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/gecko/url.rs
View file

@ -317,13 +317,10 @@ impl ComputedImageUrl {
} }
/// Convert from nsStyleImageReques to ComputedImageUrl. /// Convert from nsStyleImageReques to ComputedImageUrl.
pub unsafe fn from_image_request(image_request: &nsStyleImageRequest) -> Result<Self, ()> { pub unsafe fn from_image_request(image_request: &nsStyleImageRequest) -> Self {
if image_request.mImageValue.mRawPtr.is_null() { let image_value = image_request.mImageValue.mRawPtr
return Err(()); .as_ref().expect("mImageValue is null");
}
let image_value = image_request.mImageValue.mRawPtr.as_ref().unwrap();
let url_value_data = &image_value._base; let url_value_data = &image_value._base;
Ok(Self::from_url_value_data(url_value_data)) Self::from_url_value_data(url_value_data)
} }
} }

6
components/style/properties/gecko.mako.rs
View file

@ -4145,9 +4145,7 @@ fn static_assert() {
unsafe { unsafe {
let ref gecko_image_request = *self.gecko.mListStyleImage.mRawPtr; let ref gecko_image_request = *self.gecko.mListStyleImage.mRawPtr;
UrlOrNone::Url(ComputedImageUrl::from_image_request( UrlOrNone::Url(ComputedImageUrl::from_image_request(gecko_image_request))
gecko_image_request
).expect("mListStyleImage could not convert to ComputedImageUrl"))
} }
} }
@ -5437,7 +5435,6 @@ clip-path
let url = unsafe { let url = unsafe {
let gecko_image_request = gecko_cursor_image.mImage.mRawPtr.as_ref().unwrap(); let gecko_image_request = gecko_cursor_image.mImage.mRawPtr.as_ref().unwrap();
ComputedImageUrl::from_image_request(&gecko_image_request) ComputedImageUrl::from_image_request(&gecko_image_request)
.expect("mCursorImages.mImage could not convert to ComputedImageUrl")
}; };
let hotspot = let hotspot =
@ -5713,7 +5710,6 @@ clip-path
&**gecko_content.mContent.mImage.as_ref(); &**gecko_content.mContent.mImage.as_ref();
ContentItem::Url( ContentItem::Url(
ComputedImageUrl::from_image_request(gecko_image_request) ComputedImageUrl::from_image_request(gecko_image_request)
.expect("mContent could not convert to ComputedImageUrl")
) )
} }
}, },