Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-18 11:55:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Make creating CssUrl infallible.

Browse source 
There were a check in CssUrl::parse_from_string for extra data, which
was removed as part of servo/servo#16241, so it never fails now.

CssUrl::from_url_value_data doesn't seem to need Result from the very
beginning. It is unclear why it was made that way.

Bug: 1461858
Reviewed-by: emilio
MozReview-Commit-ID: LXzKlZ6wPYW
This commit is contained in:
Xidorn Quan 2018-05-16 12:19:31 +10:00 • committed by Emilio Cobos Álvarez
parent 0b5720547e
commit dc2aadd43a
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
6 changed files with 28 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,16 +38,11 @@ pub struct CssUrl {
impl CssUrl {
/// Try to parse a URL from a string value that is a valid CSS token for a
/// URL.
///
/// Returns `Err` in the case that extra_data is incomplete.
pub fn parse_from_string<'a>(
url: String,
context: &ParserContext,
) -> Result<Self, ParseError<'a>> {
Ok(CssUrl {
pub fn parse_from_string(url: String, context: &ParserContext) -> Self {
CssUrl {
serialization: Arc::new(url),
extra_data: context.url_data.clone(),
})
}
}
/// Returns true if the URL is definitely invalid. We don't eagerly resolve
@ -58,13 +53,13 @@ impl CssUrl {
}
/// Convert from URLValueData to SpecifiedUrl.
unsafe fn from_url_value_data(url: &URLValueData) -> Result<Self, ()> {
unsafe fn from_url_value_data(url: &URLValueData) -> Self {
let arc_type =
&url.mString as *const _ as *const RawOffsetArc<String>;
Ok(CssUrl {
CssUrl {
serialization: Arc::from_raw_offset((*arc_type).clone()),
extra_data: url.mExtraData.to_safe(),
})
}
}
/// Returns true if this URL looks like a fragment.
@ -104,7 +99,7 @@ impl Parse for CssUrl {
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
let url = input.expect_url()?;
Self::parse_from_string(url.as_ref().to_owned(), context)
Ok(Self::parse_from_string(url.as_ref().to_owned(), context))
}
}
@ -188,11 +183,8 @@ pub struct SpecifiedImageUrl {
impl SpecifiedImageUrl {
/// Parse a URL from a string value. See SpecifiedUrl::parse_from_string.
pub fn parse_from_string<'a>(
url: String,
context: &ParserContext,
) -> Result<Self, ParseError<'a>> {
CssUrl::parse_from_string(url, context).map(Self::from_css_url)
pub fn parse_from_string(url: String, context: &ParserContext) -> Self {
Self::from_css_url(CssUrl::parse_from_string(url, context))
}
fn from_css_url(url: CssUrl) -> Self {
@ -296,10 +288,10 @@ impl ToCss for ComputedUrl {
impl ComputedUrl {
/// Convert from URLValueData to ComputedUrl.
pub unsafe fn from_url_value_data(url: &URLValueData) -> Result<Self, ()> {
Ok(ComputedUrl(
SpecifiedUrl::from_css_url(CssUrl::from_url_value_data(url)?)
))
pub unsafe fn from_url_value_data(url: &URLValueData) -> Self {
ComputedUrl(
SpecifiedUrl::from_css_url(CssUrl::from_url_value_data(url))
)
}
}
@ -318,10 +310,10 @@ impl ToCss for ComputedImageUrl {
impl ComputedImageUrl {
/// Convert from URLValueData to SpecifiedUrl.
pub unsafe fn from_url_value_data(url: &URLValueData) -> Result<Self, ()> {
Ok(ComputedImageUrl(
SpecifiedImageUrl::from_css_url(CssUrl::from_url_value_data(url)?)
))
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.
@ -332,6 +324,6 @@ impl ComputedImageUrl {
let image_value = image_request.mImageValue.mRawPtr.as_ref().unwrap();
let url_value_data = &image_value._base;
Self::from_url_value_data(url_value_data)
Ok(Self::from_url_value_data(url_value_data))
}
}