mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #11303 - mbrubeck:last-resort, r=pcwalton
Always include the last-resort font This is used as a fallback for any characters that don't have glyphs in the specified font. Without this, per-glyph font fallback doesn't work because the FontGroup always contains only one font. Fixes missing glyphs on many pages on my Linux box. As a follow-up, we should probably have a smarter strategy for finding fallback fonts, possibly varying by script. (Currently we just have a few hard-coded family names.) r? @glennw <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11303) <!-- Reviewable:end -->
This commit is contained in:
commit
aa9f50a1d4
258 changed files with 127 additions and 905 deletions
|
@ -1971,6 +1971,11 @@ impl Fragment {
|
|||
}
|
||||
}
|
||||
SpecificFragmentInfo::ScannedText(ref text_fragment) => {
|
||||
// Fragments with no glyphs don't contribute any inline metrics.
|
||||
// TODO: Filter out these fragments during flow construction?
|
||||
if text_fragment.content_size.inline == Au(0) {
|
||||
return InlineMetrics::new(Au(0), Au(0), Au(0));
|
||||
}
|
||||
// See CSS 2.1 § 10.8.1.
|
||||
let line_height = self.calculate_line_height(layout_context);
|
||||
let font_derived_metrics =
|
||||
|
|
|
@ -197,17 +197,12 @@ impl TextRunScanner {
|
|||
for (byte_index, character) in text.char_indices() {
|
||||
// Search for the first font in this font group that contains a glyph for this
|
||||
// character.
|
||||
let mut font_index = 0;
|
||||
let font_index = fontgroup.fonts.iter().position(|font| {
|
||||
font.borrow().glyph_index(character).is_some()
|
||||
}).unwrap_or(0);
|
||||
|
||||
// The following code panics one way or another if this condition isn't met.
|
||||
assert!(fontgroup.fonts.len() > 0);
|
||||
while font_index < fontgroup.fonts.len() - 1 {
|
||||
if fontgroup.fonts.get(font_index).unwrap().borrow()
|
||||
.glyph_index(character)
|
||||
.is_some() {
|
||||
break
|
||||
}
|
||||
font_index += 1;
|
||||
}
|
||||
|
||||
let bidi_level = match bidi_levels {
|
||||
Some(levels) => levels[*paragraph_bytes_processed],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue