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

Rollup merge of #17013 - mbrubeck:stylo, r=emilio

Browse source 
Bug 1363639 - stylo: Make interpolation of rect() match Gecko

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17013)
<!-- Reviewable:end -->
This commit is contained in:
Manish Goregaokar 2017-05-24 11:59:27 -07:00 • committed by GitHub
commit 709912bcd3
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -753,6 +753,7 @@ impl <T> Animatable for Option<T>
(&Some(ref this), &Some(ref other)) => { (&Some(ref this), &Some(ref other)) => {
Ok(this.add_weighted(other, self_portion, other_portion).ok()) Ok(this.add_weighted(other, self_portion, other_portion).ok())
} }
(&None, &None) => Ok(None),
_ => Err(()), _ => Err(()),
} }
} }
@ -763,6 +764,7 @@ impl <T> Animatable for Option<T>
(&Some(ref this), &Some(ref other)) => { (&Some(ref this), &Some(ref other)) => {
this.compute_distance(other) this.compute_distance(other)
}, },
(&None, &None) => Ok(0.0),
_ => Err(()), _ => Err(()),
} }
} }