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

Derive ToCss for FontSize

Browse source
This commit is contained in:
Anthony Ramine 2018-03-05 15:41:10 +01:00
parent ca45695db1
commit 2aa5f68c92
2 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,14 +162,16 @@ impl Parse for FontTag {
} }
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf)] #[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf)]
#[derive(PartialEq, ToAnimatedValue, ToAnimatedZero)] #[derive(PartialEq, ToAnimatedValue, ToAnimatedZero, ToCss)]
/// Additional information for keyword-derived font sizes. /// Additional information for keyword-derived font sizes.
pub struct KeywordInfo<Length> { pub struct KeywordInfo<Length> {
/// The keyword used /// The keyword used
pub kw: KeywordSize, pub kw: KeywordSize,
/// A factor to be multiplied by the computed size of the keyword /// A factor to be multiplied by the computed size of the keyword
#[css(skip)]
pub factor: f32, pub factor: f32,
/// An additional Au offset to add to the kw*factor in the case of calcs /// An additional Au offset to add to the kw*factor in the case of calcs
#[css(skip)]
pub offset: Length, pub offset: Length,
} }

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

@ -118,7 +118,7 @@ impl ToComputedValue for FontWeight {
} }
} }
#[derive(Clone, Debug, MallocSizeOf, PartialEq)] #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
/// A specified font-size value /// A specified font-size value
pub enum FontSize { pub enum FontSize {
/// A length; e.g. 10px. /// A length; e.g. 10px.
@ -142,21 +142,6 @@ pub enum FontSize {
System(SystemFont) System(SystemFont)
} }
impl ToCss for FontSize {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
where
W: Write,
{
match *self {
FontSize::Length(ref lop) => lop.to_css(dest),
FontSize::Keyword(info) => info.kw.to_css(dest),
FontSize::Smaller => dest.write_str("smaller"),
FontSize::Larger => dest.write_str("larger"),
FontSize::System(sys) => sys.to_css(dest),
}
}
}
impl From<LengthOrPercentage> for FontSize { impl From<LengthOrPercentage> for FontSize {
fn from(other: LengthOrPercentage) -> Self { fn from(other: LengthOrPercentage) -> Self {
FontSize::Length(other) FontSize::Length(other)