Skip to content

Commit

Permalink
Auto merge of #20843 - emilio:font-stretch-anim, r=emilio
Browse files Browse the repository at this point in the history
style: Fix font-stretch animation.

This is a regression from #20506 which Gecko tests caught while trying to import
this.
  • Loading branch information
bors-servo committed May 21, 2018
2 parents affcf81 + b6a1742 commit 319556c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions components/style/values/computed/font.rs
Expand Up @@ -21,7 +21,7 @@ use std::slice;
use style_traits::{CssWriter, ParseError, ToCss};
use values::CSSFloat;
use values::animated::{ToAnimatedValue, ToAnimatedZero};
use values::computed::{Angle, Context, Integer, NonNegative, NonNegativeLength, NonNegativePercentage};
use values::computed::{Angle, Context, Integer, NonNegativeLength, NonNegativePercentage};
use values::computed::{Number, Percentage, ToComputedValue};
use values::generics::font::{self as generics, FeatureTagValue, FontSettings, VariationValue};
use values::specified::font::{self as specified, MIN_FONT_WEIGHT, MAX_FONT_WEIGHT};
Expand Down Expand Up @@ -953,12 +953,12 @@ impl ToAnimatedValue for FontStretch {

#[inline]
fn to_animated_value(self) -> Self::AnimatedValue {
(self.0).0
self.0.to_animated_value()
}

#[inline]
fn from_animated_value(animated: Self::AnimatedValue) -> Self {
FontStretch(NonNegative(animated))
FontStretch(NonNegativePercentage::from_animated_value(animated))
}
}

Expand Down

0 comments on commit 319556c

Please sign in to comment.