Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: cherry-pick some changes from m-c that had got lost.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-04-29 02:41:36 +02:00
parent 07de715bb5
commit 64cceb328a
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/values/computed/percentage.rs
View file

@ -12,8 +12,9 @@ use values::generics::NonNegative;
/// A computed percentage. /// A computed percentage.
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))] #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, Default, MallocSizeOf, PartialEq, #[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, Default,
PartialOrd, ToAnimatedZero, ToComputedValue)] MallocSizeOf, PartialEq, PartialOrd, SpecifiedValueInfo,
ToAnimatedZero, ToComputedValue)]
pub struct Percentage(pub CSSFloat); pub struct Percentage(pub CSSFloat);
impl Percentage { impl Percentage {

5
components/style/values/generics/font.rs
View file

@ -227,13 +227,14 @@ impl Default for KeywordSize {
/// ///
/// https://drafts.csswg.org/css-fonts-4/#font-style-prop /// https://drafts.csswg.org/css-fonts-4/#font-style-prop
#[allow(missing_docs)] #[allow(missing_docs)]
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf,
PartialEq, ToAnimatedValue, ToAnimatedZero)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))] #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf,
PartialEq, SpecifiedValueInfo, ToAnimatedValue, ToAnimatedZero)]
pub enum FontStyle<Angle> { pub enum FontStyle<Angle> {
#[animation(error)] #[animation(error)]
Normal, Normal,
#[animation(error)] #[animation(error)]
Italic, Italic,
#[value_info(starts_with_keyword)]
Oblique(Angle), Oblique(Angle),
} }

6
components/style/values/specified/font.rs
View file

@ -15,14 +15,16 @@ use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use parser::{Parse, ParserContext}; use parser::{Parse, ParserContext};
use properties::longhands::system_font::SystemFont; use properties::longhands::system_font::SystemFont;
use std::fmt::{self, Write}; 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::CustomIdent;
use values::computed::{Angle as ComputedAngle, Percentage as ComputedPercentage}; use values::computed::{Angle as ComputedAngle, Percentage as ComputedPercentage};
use values::computed::{font as computed, Context, Length, NonNegativeLength, ToComputedValue}; use values::computed::{font as computed, Context, Length, NonNegativeLength, ToComputedValue};
use values::computed::font::{FamilyName, FontFamilyList, FontStyleAngle, SingleFontFamily}; use values::computed::font::{FamilyName, FontFamilyList, FontStyleAngle, SingleFontFamily};
use values::generics::NonNegative; use values::generics::NonNegative;
use values::generics::font::{KeywordSize, VariationValue};
use values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag}; 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::{AllowQuirks, Angle, Integer, LengthOrPercentage, NoCalcLength, Number, Percentage};
use values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX}; use values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX};