From a732c3ff760991a53c25dc7f877f3df3f5febe73 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 17 May 2016 14:08:43 +0200 Subject: [PATCH] Simplify FontContext::create_layout_font. --- components/gfx/font_context.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs index cb572909b38..42415d9b833 100644 --- a/components/gfx/font_context.rs +++ b/components/gfx/font_context.rs @@ -118,12 +118,11 @@ impl FontContext { font_variant::T::normal => pt_size, }; - let handle: Result = - FontHandleMethods::new_from_template(&self.platform_handle, template, - Some(actual_pt_size)); + let handle = try!(FontHandle::new_from_template(&self.platform_handle, + template, + Some(actual_pt_size))); - handle.map(|handle| - Font::new(handle, variant, descriptor, pt_size, actual_pt_size, font_key)) + Ok(Font::new(handle, variant, descriptor, pt_size, actual_pt_size, font_key)) } fn expire_font_caches_if_necessary(&mut self) {