diff options
| -rw-r--r-- | components/style/values/specified/image.rs | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs index 7ec97ad4db3..166eed64fe3 100644 --- a/components/style/values/specified/image.rs +++ b/components/style/values/specified/image.rs @@ -391,35 +391,6 @@ impl ShapeExtent { } } -impl Parse for ImageRect { - fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { - match_ignore_ascii_case! { &try!(input.expect_function()), - "-moz-image-rect" => { - input.parse_nested_block(|input| { - let url = SpecifiedUrl::parse(context, input)?; - input.expect_comma()?; - let top = NumberOrPercentage::parse(context, input)?; - input.expect_comma()?; - let right = NumberOrPercentage::parse(context, input)?; - input.expect_comma()?; - let bottom = NumberOrPercentage::parse(context, input)?; - input.expect_comma()?; - let left = NumberOrPercentage::parse(context, input)?; - - Ok(ImageRect { - url: url, - top: top, - right: right, - bottom: bottom, - left: left, - }) - }) - } - _ => Err(()) - } - } -} - impl Parse for ColorStop { fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { Ok(ColorStop { @@ -428,3 +399,29 @@ impl Parse for ColorStop { }) } } + +impl Parse for ImageRect { + fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { + input.try(|i| i.expect_function_matching("-moz-image-rect"))?; + input.parse_nested_block(|i| { + let string = i.expect_url_or_string()?; + let url = SpecifiedUrl::parse_from_string(string, context)?; + i.expect_comma()?; + let top = NumberOrPercentage::parse(context, i)?; + i.expect_comma()?; + let right = NumberOrPercentage::parse(context, i)?; + i.expect_comma()?; + let bottom = NumberOrPercentage::parse(context, i)?; + i.expect_comma()?; + let left = NumberOrPercentage::parse(context, i)?; + + Ok(ImageRect { + url: url, + top: top, + right: right, + bottom: bottom, + left: left, + }) + }) + } +} |