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

Auto merge of #18292 - emilio:animate-nan, r=nox

Browse source 
style: Prevent Animate to generate NaN float values.

This should fix the assertions in https://bugzilla.mozilla.org/show_bug.cgi?id=1394558.

<!-- 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/18292)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-29 05:18:33 -05:00 • committed by GitHub
commit 1c4d0d2d5d
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/values/animated/mod.rs
View file

@ -125,7 +125,10 @@ impl Animate for i32 {
impl Animate for f32 { impl Animate for f32 {
#[inline] #[inline]
fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> { fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
Ok((*self as f64).animate(&(*other as f64), procedure)? as f32) use std::f32;
let ret = (*self as f64).animate(&(*other as f64), procedure)?;
Ok(ret.min(f32::MAX as f64).max(f32::MIN as f64) as f32)
} }
} }
@ -133,8 +136,12 @@ impl Animate for f32 {
impl Animate for f64 { impl Animate for f64 {
#[inline] #[inline]
fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> { fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
use std::f64;
let (self_weight, other_weight) = procedure.weights(); let (self_weight, other_weight) = procedure.weights();
Ok(*self * self_weight + *other * other_weight)
let ret = *self * self_weight + *other * other_weight;
Ok(ret.min(f64::MAX).max(f64::MIN))
} }
} }