Use new CFArray iterator features

1 files changed, 4 insertions, 14 deletions

diff --git a/components/gfx/platform/macos/font_list.rs b/components/gfx/platform/macos/font_list.rs
index ed3858a8466..d72111f9c1e 100644
--- a/components/gfx/platform/macos/font_list.rs
+++ b/components/gfx/platform/macos/font_list.rs
@@ -2,20 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use core_foundation::base::TCFType;
-use core_foundation::string::{CFString, CFStringRef};
 use core_text;
-use core_text::font_descriptor::{CTFontDescriptor, CTFontDescriptorRef};
 use std::borrow::ToOwned;
-use std::mem;
 
 pub fn for_each_available_family<F>(mut callback: F) where F: FnMut(String) {
     let family_names = core_text::font_collection::get_family_names();
-    for strref in family_names.iter() {
-        let family_name_ref: CFStringRef = unsafe { mem::transmute(strref) };
-        let family_name_cf: CFString = unsafe { TCFType::wrap_under_get_rule(family_name_ref) };
-        let family_name = family_name_cf.to_string();
-        callback(family_name);
+    for family_name in family_names.iter() {
+        callback(family_name.to_string());
     }
 }
 
@@ -25,11 +18,8 @@ pub fn for_each_variation<F>(family_name: &str, mut callback: F) where F: FnMut(
     let family_collection = core_text::font_collection::create_for_family(family_name);
     if let Some(family_collection) = 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);
+        for family_descriptor in family_descriptors.iter() {
+            callback(family_descriptor.font_name());
         }
     }
 }