Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Josh Matthews 2018-08-02 17:02:44 -04:00
parent 2ceb8dcd22
commit 4f596edcbf
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/gfx/font.rs
View file

@ -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
}

9
components/gfx/platform/freetype/font.rs
View file

@ -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
}
}
}

4
components/gfx/platform/macos/font.rs
View file

@ -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> {

4
components/gfx/platform/windows/font.rs
View file

@ -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> {