Skip to content
Permalink
Browse files

stylo: do not handle the fallback discrete animation inside the Anima…

…te trait.

At present, we do the fallback discrete animation for non-invertible matrices in
ComputedMatrix.animate(). However, according to the spec, we should fallback to
discrete animation for cases like:

1. animation between transform with single non-invertible matrix
2. animation between transform with matched transform functions that have at least
   one non-invertible matrix
2. animation between transform with mismatched transform functions that have at
   least one non-invertible matrix.

The current implementation only handles the first case.

Moreover, we already have fallback discrete animation procedures in CSS Animation
and Web Animation, so we should be able to not doing any fallback inside the
Animate trait.

In this patch, we let the animation between non-invertible matrices to return Err().
So, we can propagate the Err() to the callers, and let the fallback discrete
animation procedure stay at the Servo_MatrixTransform_Operate, which is ouside
the Animate trait.
  • Loading branch information...
chenpighead committed Sep 11, 2017
1 parent 5afb1b7 commit 21148c7e5183f0799745d67bfadf860c442baf3d
Showing with 14 additions and 12 deletions.
  1. +8 −10 components/style/properties/helpers/animated_properties.mako.rs
  2. +6 −2 ports/geckolib/glue.rs
@@ -1453,11 +1453,10 @@ impl Animate for ComputedMatrix {
(Ok(this), Ok(other)) => {
Ok(ComputedMatrix::from(this.animate(&other, procedure)?))
},
_ => {
let (this_weight, other_weight) = procedure.weights();
let result = if this_weight > other_weight { *self } else { *other };
Ok(result)
},
// Matrices can be undecomposable due to couple reasons, e.g.,
// non-invertible matrices. In this case, we should report Err
// here, and let the caller do the fallback procedure.
_ => Err(())
}
} else {
let this = MatrixDecomposed2D::from(*self);
@@ -1477,11 +1476,10 @@ impl Animate for ComputedMatrix {
(Ok(from), Ok(to)) => {
Ok(ComputedMatrix::from(from.animate(&to, procedure)?))
},
_ => {
let (this_weight, other_weight) = procedure.weights();
let result = if this_weight > other_weight { *self } else { *other };
Ok(result)
},
// Matrices can be undecomposable due to couple reasons, e.g.,
// non-invertible matrices. In this case, we should report Err here,
// and let the caller do the fallback procedure.
_ => Err(())
}
}
}
@@ -2218,9 +2218,13 @@ pub extern "C" fn Servo_MatrixTransform_Operate(matrix_operator: MatrixTransform
};

let output = unsafe { output.as_mut() }.expect("not a valid 'output' matrix");
if let Ok(result) = result {
if let Ok(result) = result {
*output = result.into();
};
} else if progress < 0.5 {
*output = from.clone().into();
} else {
*output = to.clone().into();
}
}

#[no_mangle]

0 comments on commit 21148c7

Please sign in to comment.
You can’t perform that action at this time.