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

Bug 1374233 - Part 3: Use NonNegativeAu as computed values for font-size related properties.

Browse source 
For font-size and font-size-adjust.

MozReview-Commit-ID: 5rrfVSzB7WF
This commit is contained in:
Boris Chiou 2017-07-21 15:38:55 +08:00
parent 191c2a282b
commit 234d2c1b32
13 changed files with 87 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/values/specified/length.rs
View file

@ -92,8 +92,8 @@ impl FontBaseSize {
pub fn resolve(&self, context: &Context) -> Au {
match *self {
FontBaseSize::Custom(size) => size,
FontBaseSize::CurrentStyle => context.style().get_font().clone_font_size(),
FontBaseSize::InheritedStyle => context.style().get_parent_font().clone_font_size(),
FontBaseSize::CurrentStyle => context.style().get_font().clone_font_size().0,
FontBaseSize::InheritedStyle => context.style().get_parent_font().clone_font_size().0,
}
}
}

2
components/style/values/specified/text.rs
View file

@ -95,7 +95,7 @@ impl ToComputedValue for LineHeight {
GenericLineHeight::Number(number.to_computed_value(context))
},
GenericLineHeight::Length(LengthOrPercentage::Length(ref length)) => {
GenericLineHeight::Length(context.maybe_zoom_text(length.to_computed_value(context)))
GenericLineHeight::Length(context.maybe_zoom_text(length.to_computed_value(context).into()).0)
},
GenericLineHeight::Length(LengthOrPercentage::Percentage(p)) => {
let font_relative_length =