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

Clean up use of Option in font_cache_task.

Browse source
This commit is contained in:
Michael Howell 2015-11-06 15:59:56 -07:00
parent e394c0d859
commit 4fccb9e74f
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/gfx/font_cache_task.rs
View file

@ -225,12 +225,8 @@ impl FontCache {
// TODO(Issue #192: handle generic font families, like 'serif' and 'sans-serif'. // TODO(Issue #192: handle generic font families, like 'serif' and 'sans-serif'.
// if such family exists, try to match style to a font // if such family exists, try to match style to a font
let result = s.find_font_for_style(desc, &self.font_context);
if result.is_some() {
return result;
}
None s.find_font_for_style(desc, &self.font_context)
} else { } else {
debug!("FontList: Couldn't find font family with name={}", &**family_name); debug!("FontList: Couldn't find font family with name={}", &**family_name);
None None
@ -251,11 +247,8 @@ impl FontCache {
fn find_font_template(&mut self, family: &LowercaseString, desc: &FontTemplateDescriptor) fn find_font_template(&mut self, family: &LowercaseString, desc: &FontTemplateDescriptor)
-> Option<Arc<FontTemplateData>> { -> Option<Arc<FontTemplateData>> {
let transformed_family_name = self.transform_family(family); let transformed_family_name = self.transform_family(family);
let mut maybe_template = self.find_font_in_web_family(&transformed_family_name, desc); self.find_font_in_web_family(&transformed_family_name, desc)
if maybe_template.is_none() { .or_else(|| self.find_font_in_local_family(&transformed_family_name, desc))
maybe_template = self.find_font_in_local_family(&transformed_family_name, desc);
}
maybe_template
} }
fn last_resort_font_template(&mut self, desc: &FontTemplateDescriptor) fn last_resort_font_template(&mut self, desc: &FontTemplateDescriptor)
@ -265,8 +258,8 @@ impl FontCache {
for family in &last_resort { for family in &last_resort {
let family = LowercaseString::new(family); let family = LowercaseString::new(family);
let maybe_font_in_family = self.find_font_in_local_family(&family, desc); let maybe_font_in_family = self.find_font_in_local_family(&family, desc);
if maybe_font_in_family.is_some() { if let Some(family) = maybe_font_in_family {
return maybe_font_in_family.unwrap(); return family;
} }
} }