diff --git a/components/style/values/computed/percentage.rs b/components/style/values/computed/percentage.rs index 7ca504d2aff..653532aea6c 100644 --- a/components/style/values/computed/percentage.rs +++ b/components/style/values/computed/percentage.rs @@ -12,8 +12,9 @@ use values::generics::NonNegative; /// A computed percentage. #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))] -#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, Default, MallocSizeOf, PartialEq, - PartialOrd, ToAnimatedZero, ToComputedValue)] +#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, Default, + MallocSizeOf, PartialEq, PartialOrd, SpecifiedValueInfo, + ToAnimatedZero, ToComputedValue)] pub struct Percentage(pub CSSFloat); impl Percentage { diff --git a/components/style/values/generics/font.rs b/components/style/values/generics/font.rs index d4e55af6a61..f5e62e0ab5f 100644 --- a/components/style/values/generics/font.rs +++ b/components/style/values/generics/font.rs @@ -227,13 +227,14 @@ impl Default for KeywordSize { /// /// https://drafts.csswg.org/css-fonts-4/#font-style-prop #[allow(missing_docs)] -#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf, - PartialEq, ToAnimatedValue, ToAnimatedZero)] #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))] +#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf, + PartialEq, SpecifiedValueInfo, ToAnimatedValue, ToAnimatedZero)] pub enum FontStyle { #[animation(error)] Normal, #[animation(error)] Italic, + #[value_info(starts_with_keyword)] Oblique(Angle), } diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs index 13ca2280997..17ff3af6382 100644 --- a/components/style/values/specified/font.rs +++ b/components/style/values/specified/font.rs @@ -15,14 +15,16 @@ use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use parser::{Parse, ParserContext}; use properties::longhands::system_font::SystemFont; use std::fmt::{self, Write}; -use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss}; +use style_traits::{CssWriter, KeywordsCollectFn, ParseError}; +use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss}; +use style_traits::values::SequenceWriter; use values::CustomIdent; use values::computed::{Angle as ComputedAngle, Percentage as ComputedPercentage}; use values::computed::{font as computed, Context, Length, NonNegativeLength, ToComputedValue}; use values::computed::font::{FamilyName, FontFamilyList, FontStyleAngle, SingleFontFamily}; use values::generics::NonNegative; -use values::generics::font::{KeywordSize, VariationValue}; use values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag}; +use values::generics::font::{KeywordSize, VariationValue}; use values::specified::{AllowQuirks, Angle, Integer, LengthOrPercentage, NoCalcLength, Number, Percentage}; use values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX};