Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rust-core-text, handle empty font collections. Fixes #3703.

Browse source
This commit is contained in:
Glenn Watson 2014-10-21 14:54:37 +10:00
parent d8cb901f6a
commit cf3d9dffd1
4 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/gfx/platform/macos/font_list.rs
View file

@ -23,12 +23,17 @@ pub fn get_variations_for_family(family_name: &str, callback: |String|) {
let family_collection =
core_text::font_collection::create_for_family(family_name.as_slice());
let family_descriptors = family_collection.get_descriptors();
for descref in family_descriptors.iter() {
let descref: CTFontDescriptorRef = unsafe { mem::transmute(descref) };
let desc: CTFontDescriptor = unsafe { TCFType::wrap_under_get_rule(descref) };
let postscript_name = desc.font_name();
callback(postscript_name);
match family_collection {
Some(family_collection) => {
let family_descriptors = family_collection.get_descriptors();
for descref in family_descriptors.iter() {
let descref: CTFontDescriptorRef = unsafe { mem::transmute(descref) };
let desc: CTFontDescriptor = unsafe { TCFType::wrap_under_get_rule(descref) };
let postscript_name = desc.font_name();
callback(postscript_name);
}
}
None => {}
}
}