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

Merge pull request #1341 from deokjinkim/layout_font_optimize

Browse source 
Use last resort font when only there is no font in font group.
This commit is contained in:
Lars Bergstrom 2013-12-06 04:54:32 -08:00
commit 24e21bcc28
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/components/gfx/font_context.rs
View file

@ -154,23 +154,25 @@ impl<'self> FontContext {
}
}
let last_resort = FontList::get_last_resort_font_families();
if fonts.len() == 0 {
let last_resort = FontList::get_last_resort_font_families();
for family in last_resort.iter() {
let result = match self.font_list {
Some(ref fl) => fl.find_font_in_family(*family, style),
None => None,
};
for family in last_resort.iter() {
let result = match self.font_list {
Some(ref fl) => fl.find_font_in_family(*family, style),
None => None,
};
for font_entry in result.iter() {
let font_id =
SelectorPlatformIdentifier(font_entry.handle.face_identifier());
let font_desc = FontDescriptor::new((*style).clone(), font_id);
for font_entry in result.iter() {
let font_id =
SelectorPlatformIdentifier(font_entry.handle.face_identifier());
let font_desc = FontDescriptor::new((*style).clone(), font_id);
let instance = self.get_font_by_descriptor(&font_desc);
let instance = self.get_font_by_descriptor(&font_desc);
for font in instance.iter() {
fonts.push(*font);
for font in instance.iter() {
fonts.push(*font);
}
}
}
}