Auto merge of #21365 - jdm:android-font, r=mbrubeck

Avoid crash using freetype in debug android builds

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #21327
- [x] These changes do not require tests because this code is only executed in debug builds

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21365)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-08-08 16:56:21 -04:00 committed by GitHub
commit 8a691f74e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions

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
}

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

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

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