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

stylo: Store font metrics provider in thread local style context

Browse source
This commit is contained in:
Manish Goregaokar 2017-04-04 11:11:27 -07:00 • committed by Manish Goregaokar
parent 2ea8d61fbf
commit e402c72d0e
19 changed files with 158 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/properties/properties.mako.rs
View file

@ -1944,6 +1944,7 @@ pub fn cascade(device: &Device,
layout_parent_style: Option<<&ComputedValues>,
cascade_info: Option<<&mut CascadeInfo>,
error_reporter: &ParseErrorReporter,
font_metrics_provider: &FontMetricsProvider,
flags: CascadeFlags)
-> ComputedValues {
debug_assert_eq!(parent_style.is_some(), layout_parent_style.is_some());
@ -1988,7 +1989,7 @@ pub fn cascade(device: &Device,
layout_parent_style,
cascade_info,
error_reporter,
None,
font_metrics_provider,
flags)
}
@ -2002,7 +2003,7 @@ pub fn apply_declarations<'a, F, I>(device: &Device,
layout_parent_style: &ComputedValues,
mut cascade_info: Option<<&mut CascadeInfo>,
error_reporter: &ParseErrorReporter,
font_metrics_provider: Option<<&FontMetricsProvider>,
font_metrics_provider: &FontMetricsProvider,
flags: CascadeFlags)
-> ComputedValues
where F: Fn() -> I,