From 1317fd83f1ece1d110c17e80634ddac2e21ccfe8 Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Mon, 14 Aug 2017 22:07:31 -0500 Subject: [PATCH] =?UTF-8?q?servo:=20Merge=20#18078=20-=20Make=20vertical-a?= =?UTF-8?q?lign=20animatable=20between=20percentage=20and=20percentage=20o?= =?UTF-8?q?r=20l=E2=80=A6=20(from=20hiikezoe:vertical-align-animation);=20?= =?UTF-8?q?r=3Dboris?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …ength. https://bugzilla.mozilla.org/show_bug.cgi?id=1387949 --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors Source-Repo: https://github.com/servo/servo Source-Revision: 0aba7442a6e59084762ecd49889c33457a90917b --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 6ededdf1ba11fce5b6a1e965b0c295237f3af524 --- .../style/properties/helpers/animated_properties.mako.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servo/components/style/properties/helpers/animated_properties.mako.rs b/servo/components/style/properties/helpers/animated_properties.mako.rs index 87325fa70cd8..ac1e5dc36609 100644 --- a/servo/components/style/properties/helpers/animated_properties.mako.rs +++ b/servo/components/style/properties/helpers/animated_properties.mako.rs @@ -943,10 +943,10 @@ impl Animatable for VerticalAlign { #[inline] fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result { match (*self, *other) { - (VerticalAlign::LengthOrPercentage(LengthOrPercentage::Length(ref this)), - VerticalAlign::LengthOrPercentage(LengthOrPercentage::Length(ref other))) => { + (VerticalAlign::LengthOrPercentage(ref this), + VerticalAlign::LengthOrPercentage(ref other)) => { this.add_weighted(other, self_portion, other_portion).map(|value| { - VerticalAlign::LengthOrPercentage(LengthOrPercentage::Length(value)) + VerticalAlign::LengthOrPercentage(value) }) } _ => Err(()),