summaryrefslogtreecommitdiffstats
path: root/servo/components/style/values/computed/font.rs
diff options
context:
space:
mode:
Diffstat (limited to 'servo/components/style/values/computed/font.rs')
-rw-r--r--servo/components/style/values/computed/font.rs14
1 files changed, 12 insertions, 2 deletions
diff --git a/servo/components/style/values/computed/font.rs b/servo/components/style/values/computed/font.rs
index de0a5e372b..e492584f75 100644
--- a/servo/components/style/values/computed/font.rs
+++ b/servo/components/style/values/computed/font.rs
@@ -8,7 +8,7 @@ use crate::parser::{Parse, ParserContext};
use crate::values::animated::ToAnimatedValue;
use crate::values::computed::{
Angle, Context, Integer, Length, NonNegativeLength, NonNegativeNumber, Number, Percentage,
- ToComputedValue,
+ ToComputedValue, Zoom,
};
use crate::values::generics::font::{
FeatureTagValue, FontSettings, TaggedFontValue, VariationValue,
@@ -278,6 +278,16 @@ impl FontSize {
self.used_size.0
}
+ /// Apply zoom to the font-size. This is usually done by ToComputedValue.
+ #[inline]
+ pub fn zoom(&self, zoom: Zoom) -> Self {
+ Self {
+ computed_size: NonNegative(Length::new(zoom.zoom(self.computed_size.0.px()))),
+ used_size: NonNegative(Length::new(zoom.zoom(self.used_size.0.px()))),
+ keyword_info: self.keyword_info,
+ }
+ }
+
#[inline]
/// Get default value of font size.
pub fn medium() -> Self {
@@ -1359,7 +1369,7 @@ impl ToResolvedValue for LineHeight {
context.style.get_font(),
wm,
Some(context.element_info.element),
- ))
+ ).to_resolved_value(context))
}
#[inline]