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

Reorganise specified::image::GradientItem methods

Browse source
This commit is contained in:
Anthony Ramine 2017-05-13 10:57:46 +02:00
parent c9d140121d
commit 9e6f9db127
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ impl Parse for Image {
if let Ok(url) = input.try(|input| SpecifiedUrl::parse(context, input)) { if let Ok(url) = input.try(|input| SpecifiedUrl::parse(context, input)) {
return Ok(GenericImage::Url(url)); return Ok(GenericImage::Url(url));
} }
if let Ok(gradient) = input.try(|input| Gradient::parse_function(context, input)) { if let Ok(gradient) = input.try(|i| Gradient::parse(context, i)) {
return Ok(GenericImage::Gradient(gradient)); return Ok(GenericImage::Gradient(gradient));
} }
if let Ok(image_rect) = input.try(|input| ImageRect::parse(context, input)) { if let Ok(image_rect) = input.try(|input| ImageRect::parse(context, input)) {
@ -113,9 +113,8 @@ impl Image {
} }
} }
impl Gradient { impl Parse for Gradient {
/// Parses a gradient from the given arguments. fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
pub fn parse_function(context: &ParserContext, input: &mut Parser) -> Result<Gradient, ()> {
enum Shape { enum Shape {
Linear, Linear,
Radial, Radial,
@ -154,7 +153,7 @@ impl Gradient {
Shape::Linear => GradientKind::parse_linear(context, i, compat_mode)?, Shape::Linear => GradientKind::parse_linear(context, i, compat_mode)?,
Shape::Radial => GradientKind::parse_radial(context, i, compat_mode)?, Shape::Radial => GradientKind::parse_radial(context, i, compat_mode)?,
}; };
let items = Gradient::parse_items(context, i)?; let items = GradientItem::parse_comma_separated(context, i)?;
Ok((shape, items)) Ok((shape, items))
})?; })?;
@ -169,24 +168,6 @@ impl Gradient {
compat_mode: compat_mode, compat_mode: compat_mode,
}) })
} }
fn parse_items(context: &ParserContext, input: &mut Parser) -> Result<Vec<GradientItem>, ()> {
let mut seen_stop = false;
let items = try!(input.parse_comma_separated(|input| {
if seen_stop {
if let Ok(hint) = input.try(|i| LengthOrPercentage::parse(context, i)) {
seen_stop = false;
return Ok(GenericGradientItem::InterpolationHint(hint));
}
}
seen_stop = true;
ColorStop::parse(context, input).map(GenericGradientItem::ColorStop)
}));
if !seen_stop || items.len() < 2 {
return Err(());
}
Ok(items)
}
} }
impl GradientKind { impl GradientKind {
@ -391,6 +372,26 @@ impl ShapeExtent {
} }
} }
impl GradientItem {
fn parse_comma_separated(context: &ParserContext, input: &mut Parser) -> Result<Vec<Self>, ()> {
let mut seen_stop = false;
let items = try!(input.parse_comma_separated(|input| {
if seen_stop {
if let Ok(hint) = input.try(|i| LengthOrPercentage::parse(context, i)) {
seen_stop = false;
return Ok(GenericGradientItem::InterpolationHint(hint));
}
}
seen_stop = true;
ColorStop::parse(context, input).map(GenericGradientItem::ColorStop)
}));
if !seen_stop || items.len() < 2 {
return Err(());
}
Ok(items)
}
}
impl Parse for ColorStop { impl Parse for ColorStop {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
Ok(ColorStop { Ok(ColorStop {