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

Re-use the TextMetrics data structure in the Layout 2020 fragment tree (#30823)

Browse source 
This data structure has all of the metrics needed to render a font and
is in `Au`. We'll need more of these metrics for implementing
`vertical-align` and its use doesn't increase the size of the Fragment
tree (as the BoxFragment is still larger). In addition, this will be
helpful when switching layout to `Au`.
This commit is contained in:
Martin Robinson 2023-12-06 10:52:23 +01:00 • committed by GitHub
parent f0b4162328
commit 8ded1072ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/layout_2020/flow/inline.rs
View file

@ -8,6 +8,7 @@ use std::vec::IntoIter;
use app_units::Au;
use atomic_refcell::AtomicRef;
use gfx::font::FontMetrics;
use gfx::text::glyph::GlyphStore;
use gfx::text::text_run::GlyphRun;
use log::warn;
@ -32,7 +33,7 @@ use crate::flow::FlowLayout;
use crate::formatting_contexts::IndependentFormattingContext;
use crate::fragment_tree::{
AnonymousFragment, BaseFragmentInfo, BoxFragment, CollapsedBlockMargins, CollapsedMargin,
FontMetrics, Fragment, HoistedSharedFragment, TextFragment,
Fragment, HoistedSharedFragment, TextFragment,
};
use crate::geom::{LogicalRect, LogicalVec2};
use crate::positioned::{
@ -893,7 +894,7 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
glyph_store: std::sync::Arc<GlyphStore>,
base_fragment_info: BaseFragmentInfo,
parent_style: &Arc<ComputedValues>,
font_metrics: FontMetrics,
font_metrics: &FontMetrics,
font_key: FontInstanceKey,
) {
let inline_advance = Length::from(glyph_store.total_advance());
@ -926,7 +927,7 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
text: vec![glyph_store],
base_fragment_info: base_fragment_info.into(),
parent_style: parent_style.clone(),
font_metrics,
font_metrics: font_metrics.clone(),
font_key,
text_decoration_line: self.current_inline_container_state().text_decoration_line,
}),
@ -1644,7 +1645,7 @@ impl TextRun {
);
Ok(BreakAndShapeResult {
font_metrics: (&font.metrics).into(),
font_metrics: font.metrics.clone(),
font_key: font.font_key,
runs,
break_at_start,
@ -1729,7 +1730,7 @@ impl TextRun {
run.glyph_store,
self.base_fragment_info,
&self.parent_style,
font_metrics,
&font_metrics,
font_key,
);
}
@ -1930,7 +1931,7 @@ struct TextRunLineItem {
fn line_height(parent_style: &ComputedValues, font_metrics: &FontMetrics) -> Length {
let font_size = parent_style.get_font().font_size.computed_size();
match parent_style.get_inherited_text().line_height {
LineHeight::Normal => font_metrics.line_gap,
LineHeight::Normal => Length::from(font_metrics.line_gap),
LineHeight::Number(number) => font_size * number.0,
LineHeight::Length(length) => length.0,
}
@ -1946,8 +1947,8 @@ fn line_gap_from_style(layout_context: &LayoutContext, style: &ComputedValues) -
return Length::zero();
},
};
let font_metrics: FontMetrics = (&font.borrow().metrics).into();
font_metrics.line_gap
let font = font.borrow();
Length::from(font.metrics.line_gap)
})
}
@ -1961,8 +1962,8 @@ fn line_height_from_style(layout_context: &LayoutContext, style: &ComputedValues
return Length::zero();
},
};
let font_metrics: FontMetrics = (&font.borrow().metrics).into();
line_height(style, &font_metrics)
let font = font.borrow();
line_height(style, &font.metrics)
})
}