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

Don't fallback to discrete animations within animate().

Browse source
This commit is contained in:
Hiroyuki Ikezoe 2017-08-28 14:16:33 +09:00
parent 5ddc446a64
commit 21db77eb4e
1 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2623,13 +2623,7 @@ where
(&SVGLength::Length(ref this), &SVGLength::Length(ref other)) => { (&SVGLength::Length(ref this), &SVGLength::Length(ref other)) => {
Ok(SVGLength::Length(this.animate(other, procedure)?)) Ok(SVGLength::Length(this.animate(other, procedure)?))
}, },
_ => { _ => Err(()),
// FIXME(nox): Is this correct for addition and accumulation?
// I think an error should be returned if it's not
// an interpolation.
let (this_weight, other_weight) = procedure.weights();
Ok(if this_weight > other_weight { self.clone() } else { other.clone() })
},
} }
} }
} }
@ -2649,10 +2643,7 @@ where
(&SVGStrokeDashArray::Values(ref this), &SVGStrokeDashArray::Values(ref other)) => { (&SVGStrokeDashArray::Values(ref this), &SVGStrokeDashArray::Values(ref other)) => {
Ok(SVGStrokeDashArray::Values(this.animate(other, procedure)?)) Ok(SVGStrokeDashArray::Values(this.animate(other, procedure)?))
}, },
_ => { _ => Err(()),
let (this_weight, other_weight) = procedure.weights();
Ok(if this_weight > other_weight { self.clone() } else { other.clone() })
},
} }
} }
} }
@ -2684,13 +2675,7 @@ where
(&SVGOpacity::Opacity(ref this), &SVGOpacity::Opacity(ref other)) => { (&SVGOpacity::Opacity(ref this), &SVGOpacity::Opacity(ref other)) => {
Ok(SVGOpacity::Opacity(this.animate(other, procedure)?)) Ok(SVGOpacity::Opacity(this.animate(other, procedure)?))
}, },
_ => { _ => Err(()),
// FIXME(nox): Is this correct for addition and accumulation?
// I think an error should be returned if it's not
// an interpolation.
let (this_weight, other_weight) = procedure.weights();
Ok(if this_weight > other_weight { self.clone() } else { other.clone() })
},
} }
} }
} }