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

Add get_zero_value for IntermediateSVGPaint.

Browse source
This commit is contained in:
Mantaroh Yoshinaga 2017-06-22 15:14:03 +09:00
parent efed75ae5a
commit c89c938623
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -2765,7 +2765,7 @@ impl Animatable for IntermediateRGBA {
#[inline] #[inline]
fn get_zero_value(&self) -> Option<Self> { fn get_zero_value(&self) -> Option<Self> {
Some(IntermediateRGBA::new(0., 0., 0., 1.)) Some(IntermediateRGBA::transparent())
} }
#[inline] #[inline]
@ -2982,6 +2982,14 @@ impl Animatable for IntermediateSVGPaint {
Ok(self.kind.compute_squared_distance(&other.kind)? + Ok(self.kind.compute_squared_distance(&other.kind)? +
self.fallback.compute_squared_distance(&other.fallback)?) self.fallback.compute_squared_distance(&other.fallback)?)
} }
#[inline]
fn get_zero_value(&self) -> Option<Self> {
Some(IntermediateSVGPaint {
kind: option_try!(self.kind.get_zero_value()),
fallback: self.fallback.and_then(|v| v.get_zero_value()),
})
}
} }
impl Animatable for IntermediateSVGPaintKind { impl Animatable for IntermediateSVGPaintKind {
@ -3012,6 +3020,18 @@ impl Animatable for IntermediateSVGPaintKind {
_ => Err(()) _ => Err(())
} }
} }
#[inline]
fn get_zero_value(&self) -> Option<Self> {
match self {
&SVGPaintKind::Color(ref color) => color.get_zero_value()
.map(SVGPaintKind::Color),
&SVGPaintKind::None |
&SVGPaintKind::ContextFill |
&SVGPaintKind::ContextStroke => Some(self.clone()),
_ => None,
}
}
} }
#[derive(Copy, Clone, Debug, PartialEq)] #[derive(Copy, Clone, Debug, PartialEq)]