Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

canvas: Bail out from font loading if no default font can be loaded.

Browse source
This commit is contained in:
Josh Matthews 2020-07-06 12:35:57 -04:00
parent 637c6c0aec
commit 8e33806b9d
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/canvas/canvas_data.rs
View file

@ -528,13 +528,21 @@ impl<'a> CanvasData<'a> {
// are not already in the memory. // are not already in the memory.
if let Some(bytes) = font.handle.template().bytes_if_in_memory() { if let Some(bytes) = font.handle.template().bytes_if_in_memory() {
Font::from_bytes(Arc::new(bytes), 0) Font::from_bytes(Arc::new(bytes), 0)
.unwrap_or_else(|_| load_system_font_from_style(Some(style))) .ok()
.or_else(|| load_system_font_from_style(Some(style)))
} else { } else {
load_system_font_from_style(Some(style)) load_system_font_from_style(Some(style))
} }
}) })
}, },
); );
let font = match font {
Some(f) => f,
None => {
error!("Couldn't load desired font or system fallback.");
return;
},
};
let font_width = font_width(&text, point_size, &font); let font_width = font_width(&text, point_size, &font);
// Step 6. // Step 6.
@ -1390,7 +1398,7 @@ fn to_font_kit_family(font_family: &font::SingleFontFamily) -> FamilyName {
} }
} }
fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Font { fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Option<Font> {
let mut properties = Properties::new(); let mut properties = Properties::new();
let style = match font_style { let style = match font_style {
Some(style) => style, Some(style) => style,
@ -1420,18 +1428,21 @@ fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Font {
return load_default_system_fallback_font(&properties); return load_default_system_fallback_font(&properties);
}, },
}; };
font_handle.load().unwrap_or_else(|e| { match font_handle.load() {
error!("error loading font for style {:?}: {}", style, e); Ok(f) => Some(f),
load_default_system_fallback_font(&properties) Err(e) => {
}) error!("error loading font for style {:?}: {}", style, e);
load_default_system_fallback_font(&properties)
},
}
} }
fn load_default_system_fallback_font(properties: &Properties) -> Font { fn load_default_system_fallback_font(properties: &Properties) -> Option<Font> {
SystemSource::new() SystemSource::new()
.select_best_match(&[FamilyName::SansSerif], properties) .select_best_match(&[FamilyName::SansSerif], properties)
.expect("error getting font handle for default system font") .ok()?
.load() .load()
.expect("error loading default system font") .ok()
} }
fn replace_ascii_whitespace(text: String) -> String { fn replace_ascii_whitespace(text: String) -> String {