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

Clean up conditional compilation in Image::parse

Browse source
This commit is contained in:
Anthony Ramine 2017-07-12 10:10:33 +02:00
parent a3af32155f
commit 50c46ae0e1
1 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,22 +125,17 @@ pub type ColorStop = GenericColorStop<RGBAColor, LengthOrPercentage>;
/// Specified values for `moz-image-rect` /// Specified values for `moz-image-rect`
/// -moz-image-rect(<uri>, top, right, bottom, left); /// -moz-image-rect(<uri>, top, right, bottom, left);
pub type ImageRect = GenericImageRect<NumberOrPercentage>; pub type MozImageRect = GenericMozImageRect<NumberOrPercentage>;
impl Parse for Image { impl Parse for Image {
#[cfg_attr(not(feature = "gecko"), allow(unused_mut))]
fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Image, ParseError<'i>> { fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Image, ParseError<'i>> {
#[cfg(feature = "gecko")] if let Ok(mut url) = input.try(|input| SpecifiedUrl::parse(context, input)) {
{ #[cfg(feature = "gecko")]
if let Ok(mut url) = input.try(|input| SpecifiedUrl::parse(context, input)) { {
url.build_image_value(); url.build_image_value();
return Ok(GenericImage::Url(url)); }
} return Ok(GenericImage::Url(url));
}
#[cfg(feature = "servo")]
{
if let Ok(url) = input.try(|input| SpecifiedUrl::parse(context, input)) {
return Ok(GenericImage::Url(url));
}
} }
if let Ok(gradient) = input.try(|i| Gradient::parse(context, i)) { if let Ok(gradient) = input.try(|i| Gradient::parse(context, i)) {
return Ok(GenericImage::Gradient(gradient)); return Ok(GenericImage::Gradient(gradient));
@ -151,20 +146,13 @@ impl Parse for Image {
return Ok(GenericImage::PaintWorklet(paint_worklet)); return Ok(GenericImage::PaintWorklet(paint_worklet));
} }
} }
#[cfg(feature = "gecko")] if let Ok(mut image_rect) = input.try(|input| ImageRect::parse(context, input)) {
{ #[cfg(feature = "gecko")]
if let Ok(mut image_rect) = input.try(|input| ImageRect::parse(context, input)) { {
image_rect.url.build_image_value(); image_rect.url.build_image_value();
return Ok(GenericImage::Rect(image_rect));
} }
return Ok(GenericImage::Rect(image_rect));
} }
#[cfg(feature = "servo")]
{
if let Ok(image_rect) = input.try(|input| ImageRect::parse(context, input)) {
return Ok(GenericImage::Rect(image_rect));
}
}
Ok(GenericImage::Element(Image::parse_element(input)?)) Ok(GenericImage::Element(Image::parse_element(input)?))
} }
} }