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

Derive Animate for ShapeRadius<L>

Browse source
This commit is contained in:
Anthony Ramine 2017-08-25 23:37:51 +02:00
parent af560a8fab
commit e49dbc4dfa
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/style/values/generics/basic_shape.rs
View file

@ -94,10 +94,13 @@ pub struct Ellipse<H, V, LengthOrPercentage> {
/// https://drafts.csswg.org/css-shapes/#typedef-shape-radius /// https://drafts.csswg.org/css-shapes/#typedef-shape-radius
#[allow(missing_docs)] #[allow(missing_docs)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[derive(Clone, ComputeSquaredDistance, Copy, Debug, PartialEq, ToComputedValue, ToCss)] #[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, PartialEq)]
#[derive(ToComputedValue, ToCss)]
pub enum ShapeRadius<LengthOrPercentage> { pub enum ShapeRadius<LengthOrPercentage> {
Length(LengthOrPercentage), Length(LengthOrPercentage),
#[animation(error)]
ClosestSide, ClosestSide,
#[animation(error)]
FarthestSide, FarthestSide,
} }
@ -191,20 +194,6 @@ impl<L> ToCss for InsetRect<L>
} }
} }
impl<L> Animate for ShapeRadius<L>
where
L: Animate,
{
fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
match (self, other) {
(&ShapeRadius::Length(ref this), &ShapeRadius::Length(ref other)) => {
Ok(ShapeRadius::Length(this.animate(other, procedure)?))
},
_ => Err(()),
}
}
}
impl<L> Default for ShapeRadius<L> { impl<L> Default for ShapeRadius<L> {
#[inline] #[inline]
fn default() -> Self { ShapeRadius::ClosestSide } fn default() -> Self { ShapeRadius::ClosestSide }