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

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

View file

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