diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/gfx/font.rs | 14 | ||||
| -rw-r--r-- | components/gfx/platform/macos/font_list.rs | 20 |
2 files changed, 13 insertions, 21 deletions
diff --git a/components/gfx/font.rs b/components/gfx/font.rs index ec0fd7ac9d4..a8f7140628e 100644 --- a/components/gfx/font.rs +++ b/components/gfx/font.rs @@ -140,9 +140,8 @@ impl Font { text: text.to_owned(), options: options.clone(), }; - match self.shape_cache.find(&lookup_key) { - None => {} - Some(glyphs) => return glyphs.clone(), + if let Some(glyphs) = self.shape_cache.find(&lookup_key) { + return glyphs.clone(); } let mut glyphs = GlyphStore::new(text.chars().count(), @@ -159,12 +158,9 @@ impl Font { fn make_shaper<'a>(&'a mut self, options: &ShapingOptions) -> &'a Shaper { // fast path: already created a shaper - match self.shaper { - Some(ref mut shaper) => { - shaper.set_options(options); - return shaper - }, - None => {} + if let Some(ref mut shaper) = self.shaper { + shaper.set_options(options); + return shaper } let shaper = Shaper::new(self, options); diff --git a/components/gfx/platform/macos/font_list.rs b/components/gfx/platform/macos/font_list.rs index d5d221f375e..6c5ed6f91ea 100644 --- a/components/gfx/platform/macos/font_list.rs +++ b/components/gfx/platform/macos/font_list.rs @@ -23,19 +23,15 @@ pub fn get_available_families<F>(mut callback: F) where F: FnMut(String) { pub fn get_variations_for_family<F>(family_name: &str, mut callback: F) where F: FnMut(String) { debug!("Looking for faces of family: {}", family_name); - let family_collection = - core_text::font_collection::create_for_family(family_name); - match family_collection { - Some(family_collection) => { - let family_descriptors = family_collection.get_descriptors(); - for descref in family_descriptors.iter() { - let descref: CTFontDescriptorRef = unsafe { mem::transmute(descref) }; - let desc: CTFontDescriptor = unsafe { TCFType::wrap_under_get_rule(descref) }; - let postscript_name = desc.font_name(); - callback(postscript_name); - } + let family_collection = core_text::font_collection::create_for_family(family_name); + if let Some(family_collection) = family_collection { + let family_descriptors = family_collection.get_descriptors(); + for descref in family_descriptors.iter() { + let descref: CTFontDescriptorRef = unsafe { mem::transmute(descref) }; + let desc: CTFontDescriptor = unsafe { TCFType::wrap_under_get_rule(descref) }; + let postscript_name = desc.font_name(); + callback(postscript_name); } - None => {} } } |