From 380e5e2a25c5a5880a6350283695e674c82b8ca0 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 9 Apr 2018 01:47:58 -0400 Subject: [PATCH] servo: Merge #20575 - Use correct filler y value when animating with an implied-y translate()s (from Manishearth:filler-y); r=emilio r=emilio https://bugzilla.mozilla.org/show_bug.cgi?id=1451724 Source-Repo: https://github.com/servo/servo Source-Revision: e460b4ab8a9abfe70d0cac9cf03160510f791b7c --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 8d1bb775be1dd91e7b050b867fb41fbdd482005d --- .../style/properties/helpers/animated_properties.mako.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servo/components/style/properties/helpers/animated_properties.mako.rs b/servo/components/style/properties/helpers/animated_properties.mako.rs index bb6931cdde3f..237cf021bea6 100644 --- a/servo/components/style/properties/helpers/animated_properties.mako.rs +++ b/servo/components/style/properties/helpers/animated_properties.mako.rs @@ -1204,7 +1204,8 @@ impl Animate for ComputedTransformOperation { ) => { Ok(TransformOperation::Translate( fx.animate(tx, procedure)?, - Some(fy.unwrap_or(*fx).animate(&ty.unwrap_or(*tx), procedure)?) + Some(fy.unwrap_or(LengthOrPercentage::zero()) + .animate(&ty.unwrap_or(LengthOrPercentage::zero()), procedure)?) )) }, (