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

style: Prevent Animate to generate NaN float values.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-08-29 11:56:12 +02:00
parent f6e4c5547c
commit a7210fd082
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
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))
} }
} }