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

style: Use rust types for gradient stops.

Browse source 
This doesn't clean up all that much, yet, but it's a step in the right
direction.

Differential Revision: https://phabricator.services.mozilla.com/D29168
This commit is contained in:
Emilio Cobos Álvarez 2019-04-30 20:37:54 +00:00
parent e40500622e
commit 8123007717
4 changed files with 52 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -484,24 +484,24 @@ impl Gradient {
if reverse_stops {
p.reverse();
}
Ok(generic::GradientItem::ColorStop(generic::ColorStop {
color: color,
position: Some(p.into()),
}))
Ok(generic::GradientItem::ComplexColorStop {
color,
position: p.into(),
})
})
})
.unwrap_or(vec![]);
if items.is_empty() {
items = vec![
generic::GradientItem::ColorStop(generic::ColorStop {
generic::GradientItem::ComplexColorStop {
color: Color::transparent().into(),
position: Some(Percentage::zero().into()),
}),
generic::GradientItem::ColorStop(generic::ColorStop {
position: Percentage::zero().into(),
},
generic::GradientItem::ComplexColorStop {
color: Color::transparent().into(),
position: Some(Percentage::hundred().into()),
}),
position: Percentage::hundred().into(),
},
];
} else if items.len() == 1 {
let first = items[0].clone();
@ -510,12 +510,12 @@ impl Gradient {
items.sort_by(|a, b| {
match (a, b) {
(
&generic::GradientItem::ColorStop(ref a),
&generic::GradientItem::ColorStop(ref b),
) => match (&a.position, &b.position) {
&generic::GradientItem::ComplexColorStop { position: ref a_position, .. },
&generic::GradientItem::ComplexColorStop { position: ref b_position, .. },
) => match (a_position, b_position) {
(
&Some(LengthPercentage::Percentage(a)),
&Some(LengthPercentage::Percentage(b)),
&LengthPercentage::Percentage(a),
&LengthPercentage::Percentage(b),
) => {
return a.0.partial_cmp(&b.0).unwrap_or(Ordering::Equal);
},
@ -960,13 +960,13 @@ impl GradientItem {
if let Ok(multi_position) = input.try(|i| LengthPercentage::parse(context, i)) {
let stop_color = stop.color.clone();
items.push(generic::GradientItem::ColorStop(stop));
items.push(generic::GradientItem::ColorStop(ColorStop {
items.push(stop.into_item());
items.push(ColorStop {
color: stop_color,
position: Some(multi_position),
}));
}.into_item());
} else {
items.push(generic::GradientItem::ColorStop(stop));
items.push(stop.into_item());
}
seen_stop = true;