From 45a37503afd3d712c9c69d7745a9f80d1b127bbf Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Wed, 16 May 2018 13:39:58 +1000 Subject: [PATCH] style: Make from_image_request infallible. 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 --- components/style/gecko/url.rs | 11 ++++------- components/style/properties/gecko.mako.rs | 6 +----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/components/style/gecko/url.rs b/components/style/gecko/url.rs index f127e16a9bd..102f59dad9c 100644 --- a/components/style/gecko/url.rs +++ b/components/style/gecko/url.rs @@ -317,13 +317,10 @@ impl ComputedImageUrl { } /// Convert from nsStyleImageReques to ComputedImageUrl. - pub unsafe fn from_image_request(image_request: &nsStyleImageRequest) -> Result { - if image_request.mImageValue.mRawPtr.is_null() { - return Err(()); - } - - let image_value = image_request.mImageValue.mRawPtr.as_ref().unwrap(); + pub unsafe fn from_image_request(image_request: &nsStyleImageRequest) -> Self { + let image_value = image_request.mImageValue.mRawPtr + .as_ref().expect("mImageValue is null"); let url_value_data = &image_value._base; - Ok(Self::from_url_value_data(url_value_data)) + Self::from_url_value_data(url_value_data) } } diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 7d17c8111dd..2f091b8d5ab 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -4145,9 +4145,7 @@ fn static_assert() { unsafe { let ref gecko_image_request = *self.gecko.mListStyleImage.mRawPtr; - UrlOrNone::Url(ComputedImageUrl::from_image_request( - gecko_image_request - ).expect("mListStyleImage could not convert to ComputedImageUrl")) + UrlOrNone::Url(ComputedImageUrl::from_image_request(gecko_image_request)) } } @@ -5437,7 +5435,6 @@ clip-path let url = unsafe { let gecko_image_request = gecko_cursor_image.mImage.mRawPtr.as_ref().unwrap(); ComputedImageUrl::from_image_request(&gecko_image_request) - .expect("mCursorImages.mImage could not convert to ComputedImageUrl") }; let hotspot = @@ -5713,7 +5710,6 @@ clip-path &**gecko_content.mContent.mImage.as_ref(); ContentItem::Url( ComputedImageUrl::from_image_request(gecko_image_request) - .expect("mContent could not convert to ComputedImageUrl") ) } },