gfx: Make FontHandleMethods::family_name return an optional value.

servo · Aug 8, 2018 · 4f596ed · 4f596ed
1 parent 2ceb8dc
commit 4f596ed
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/components/gfx/font.rs b/components/gfx/font.rs
@@ -56,7 +56,7 @@ pub trait FontHandleMethods: Sized {
     ) -> Result<Self, ()>;
 
     fn template(&self) -> Arc<FontTemplateData>;
-    fn family_name(&self) -> String;
+    fn family_name(&self) -> Option<String>;
     fn face_name(&self) -> Option<String>;
 
     fn style(&self) -> font_style::T;
@@ -289,7 +289,8 @@ impl Font {
 
         debug!("{} font table[{}] with family={}, face={}",
                status, tag.tag_to_str(),
-               self.handle.family_name(), self.handle.face_name().unwrap_or("unavailable".to_owned()));
+               self.handle.family_name().unwrap_or("unavailable".to_owned()),
+               self.handle.face_name().unwrap_or("unavailable".to_owned()));
 
         result
     }

diff --git a/components/gfx/platform/freetype/font.rs b/components/gfx/platform/freetype/font.rs
@@ -148,9 +148,14 @@ impl FontHandleMethods for FontHandle {
         self.font_data.clone()
     }
 
-    fn family_name(&self) -> String {
+    fn family_name(&self) -> Option<String> {
         unsafe {
-            c_str_to_string((*self.face).family_name as *const c_char)
+            let family_name = (*self.face).family_name;
+            if !family_name.is_null() {
+                Some(c_str_to_string(family_name as *const c_char))
+            } else {
+                None
+            }
         }
     }
 

diff --git a/components/gfx/platform/macos/font.rs b/components/gfx/platform/macos/font.rs
@@ -195,8 +195,8 @@ impl FontHandleMethods for FontHandle {
         self.font_data.clone()
     }
 
-    fn family_name(&self) -> String {
-        self.ctfont.family_name()
+    fn family_name(&self) -> Option<String> {
+        Some(self.ctfont.family_name())
     }
 
     fn face_name(&self) -> Option<String> {

diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs
@@ -294,8 +294,8 @@ impl FontHandleMethods for FontHandle {
         self.font_data.clone()
     }
 
-    fn family_name(&self) -> String {
-        self.info.family_name.clone()
+    fn family_name(&self) -> Option<String> {
+        Some(self.info.family_name.clone())
     }
 
     fn face_name(&self) -> Option<String> {