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

Backed out changeset 616bd23b9896 (bug 1391145) for frequently failing mochitests layout/style/test/test_animations.html and layout/style/test/test_animations_omta.html on Linux x64. r=backout

Browse source 
Backs out https://github.com/servo/servo/pull/18492
This commit is contained in:
Gecko Backout 2017-09-16 13:48:06 +00:00 • committed by moz-servo-sync
parent 4c04ece8c5
commit 1aa0b20e09
4 changed files with 20 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1183,21 +1183,6 @@ impl ToAnimatedZero for TransformOperation {
sy.to_animated_zero()?,
))
},
TransformOperation::TranslateX(ref tx) => {
Ok(TransformOperation::TranslateX(
tx.to_animated_zero()?
))
},
TransformOperation::TranslateY(ref ty) => {
Ok(TransformOperation::TranslateY(
ty.to_animated_zero()?
))
},
TransformOperation::TranslateZ(ref tz) => {
Ok(TransformOperation::TranslateZ(
tz.to_animated_zero()?
))
},
TransformOperation::Translate(ref tx, ref ty, ref tz) => {
Ok(TransformOperation::Translate(
tx.to_animated_zero()?,
@ -1208,12 +1193,6 @@ impl ToAnimatedZero for TransformOperation {
TransformOperation::Scale(..) => {
Ok(TransformOperation::Scale(1.0, 1.0, 1.0))
},
TransformOperation::ScaleX(_) => Ok(TransformOperation::ScaleX(1.)),
TransformOperation::ScaleY(_) => Ok(TransformOperation::ScaleY(1.)),
TransformOperation::ScaleZ(_) => Ok(TransformOperation::ScaleZ(1.)),
TransformOperation::RotateX(_) => Ok(TransformOperation::RotateX(Angle::zero())),
TransformOperation::RotateY(_) => Ok(TransformOperation::RotateY(Angle::zero())),
TransformOperation::RotateZ(_) => Ok(TransformOperation::RotateZ(Angle::zero())),
TransformOperation::Rotate(x, y, z, a) => {
let (x, y, z, _) = TransformList::get_normalized_vector_and_angle(x, y, z, a);
Ok(TransformOperation::Rotate(x, y, z, Angle::zero()))
@ -1278,30 +1257,6 @@ impl Animate for TransformOperation {
fz.animate(tz, procedure)?,
))
},
(
&TransformOperation::TranslateX(ref from),
&TransformOperation::TranslateX(ref to),
) => {
Ok(TransformOperation::TranslateX(
from.animate(to, procedure)?,
))
},
(
&TransformOperation::TranslateY(ref from),
&TransformOperation::TranslateY(ref to),
) => {
Ok(TransformOperation::TranslateY(
from.animate(to, procedure)?,
))
},
(
&TransformOperation::TranslateZ(ref from),
&TransformOperation::TranslateZ(ref to),
) => {
Ok(TransformOperation::TranslateZ(
from.animate(to, procedure)?,
))
},
(
&TransformOperation::Scale(ref fx, ref fy, ref fz),
&TransformOperation::Scale(ref tx, ref ty, ref tz),
@ -1312,48 +1267,6 @@ impl Animate for TransformOperation {
animate_multiplicative_factor(*fz, *tz, procedure)?,
))
},
(
&TransformOperation::ScaleX(ref from),
&TransformOperation::ScaleX(ref to),
) => {
Ok(TransformOperation::ScaleX(
animate_multiplicative_factor(*from, *to, procedure)?,
))
},
(
&TransformOperation::ScaleY(ref from),
&TransformOperation::ScaleY(ref to),
) => {
Ok(TransformOperation::ScaleY(
animate_multiplicative_factor(*from, *to, procedure)?,
))
},
(
&TransformOperation::ScaleZ(ref from),
&TransformOperation::ScaleZ(ref to),
) => {
Ok(TransformOperation::ScaleZ(
animate_multiplicative_factor(*from, *to, procedure)?,
))
},
(
&TransformOperation::RotateX(ref from),
&TransformOperation::RotateX(ref to),
) => {
Ok(TransformOperation::RotateX(from.animate(to, procedure)?))
},
(
&TransformOperation::RotateY(ref from),
&TransformOperation::RotateY(ref to),
) => {
Ok(TransformOperation::RotateY(from.animate(to, procedure)?))
},
(
&TransformOperation::RotateZ(ref from),
&TransformOperation::RotateZ(ref to),
) => {
Ok(TransformOperation::RotateZ(from.animate(to, procedure)?))
},
(
&TransformOperation::Rotate(fx, fy, fz, fa),
&TransformOperation::Rotate(tx, ty, tz, ta),