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

Return Err(()) if determinant is not 1 or -1 while decomposing the 2d matrix.

Browse source 
This may happen in some cases, and we shouldn't panic in debug mode,
so let's return Err(()) for it to fall back to discrete animation.
This commit is contained in:
Boris Chiou 2017-08-30 12:03:25 +08:00
parent 88e7906191
commit 5c5a72c1d8
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1692,8 +1692,8 @@ fn decompose_2d_matrix(matrix: &ComputedMatrix) -> Result<MatrixDecomposed3D, ()
// | 0 0 0 1 |
let (mut m11, mut m12) = (matrix.m11, matrix.m12);
let (mut m21, mut m22) = (matrix.m21, matrix.m22);
// Check if this is a singular matrix.
if m11 * m22 == m12 * m21 {
// singular matrix
return Err(());
}
@ -1711,8 +1711,10 @@ fn decompose_2d_matrix(matrix: &ComputedMatrix) -> Result<MatrixDecomposed3D, ()
shear_xy /= scale_y;
let determinant = m11 * m22 - m12 * m21;
debug_assert!(0.99 < determinant.abs() && determinant.abs() < 1.01,
"determinant should now be 1 or -1");
// Determinant should now be 1 or -1.
if 0.99 > determinant.abs() || determinant.abs() > 1.01 {
return Err(());
}
if determinant < 0. {
m11 = -m11;