diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-04-09 01:47:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 01:47:58 -0400 |
| commit | e460b4ab8a9abfe70d0cac9cf03160510f791b7c (patch) | |
| tree | 5146652aafccbac6a5bf547c280a6de60ef6f81a | |
| parent | 954ac8157f1acac6454ced09bfc948a0bcce75e2 (diff) | |
| parent | e5afb22184a7092e2d36b97ba5a3243fe252acc1 (diff) | |
| download | servo-e460b4ab8a9abfe70d0cac9cf03160510f791b7c.tar.gz servo-e460b4ab8a9abfe70d0cac9cf03160510f791b7c.zip | |
Auto merge of #20575 - Manishearth:filler-y, r=emilio
Use correct filler y value when animating with an implied-y translate()s
r=emilio https://bugzilla.mozilla.org/show_bug.cgi?id=1451724
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20575)
<!-- Reviewable:end -->
| -rw-r--r-- | components/style/properties/helpers/animated_properties.mako.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs index bb6931cdde3..237cf021bea 100644 --- a/components/style/properties/helpers/animated_properties.mako.rs +++ b/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)?) )) }, ( |