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

Fix panic when font face name is not available

Browse source
This commit is contained in:
Dominik Boehi 2017-04-12 20:36:20 +02:00
parent eb058e20a9
commit ecab3cd796
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/gfx/font.rs
View file

@ -48,7 +48,7 @@ pub trait FontHandleMethods: Sized {
-> Result<Self, ()>; -> Result<Self, ()>;
fn template(&self) -> Arc<FontTemplateData>; fn template(&self) -> Arc<FontTemplateData>;
fn family_name(&self) -> String; fn family_name(&self) -> String;
fn face_name(&self) -> String; fn face_name(&self) -> Option<String>;
fn is_italic(&self) -> bool; fn is_italic(&self) -> bool;
fn boldness(&self) -> font_weight::T; fn boldness(&self) -> font_weight::T;
fn stretchiness(&self) -> font_stretch::T; fn stretchiness(&self) -> font_stretch::T;
@ -254,7 +254,7 @@ impl Font {
debug!("{} font table[{}] with family={}, face={}", debug!("{} font table[{}] with family={}, face={}",
status, tag.tag_to_str(), status, tag.tag_to_str(),
self.handle.family_name(), self.handle.face_name()); self.handle.family_name(), self.handle.face_name().unwrap_or("unavailable".to_owned()));
result result
} }

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

@ -113,9 +113,15 @@ impl FontHandleMethods for FontHandle {
c_str_to_string((*self.face).family_name as *const c_char) c_str_to_string((*self.face).family_name as *const c_char)
} }
} }
fn face_name(&self) -> String { fn face_name(&self) -> Option<String> {
unsafe { unsafe {
c_str_to_string(FT_Get_Postscript_Name(self.face) as *const c_char) let name = FT_Get_Postscript_Name(self.face) as *const c_char;
if !name.is_null() {
Some(c_str_to_string(name))
} else {
None
}
} }
} }
fn is_italic(&self) -> bool { fn is_italic(&self) -> bool {

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

@ -202,8 +202,8 @@ impl FontHandleMethods for FontHandle {
self.ctfont.family_name() self.ctfont.family_name()
} }
fn face_name(&self) -> String { fn face_name(&self) -> Option<String> {
self.ctfont.face_name() Some(self.ctfont.face_name())
} }
fn is_italic(&self) -> bool { fn is_italic(&self) -> bool {

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

@ -299,8 +299,8 @@ impl FontHandleMethods for FontHandle {
self.info.family_name.clone() self.info.family_name.clone()
} }
fn face_name(&self) -> String { fn face_name(&self) -> Option<String> {
self.info.face_name.clone() Some(self.info.face_name.clone())
} }
fn is_italic(&self) -> bool { fn is_italic(&self) -> bool {