Use NativeFontHandle instead of CGFont

This commit is contained in:
alfredoyang 2017-04-18 17:41:14 +08:00 committed by Glenn Watson
parent c4b1033b17
commit 13dd197c96

View file

@ -18,6 +18,7 @@ use std::fs::File;
use std::io::{Read, Error as IoError}; use std::io::{Read, Error as IoError};
use std::ops::Deref; use std::ops::Deref;
use std::sync::Mutex; use std::sync::Mutex;
use webrender_traits::NativeFontHandle;
/// Platform specific font representation for mac. /// Platform specific font representation for mac.
/// The identifier is a PostScript font name. The /// The identifier is a PostScript font name. The
@ -106,8 +107,8 @@ impl FontTemplateData {
} }
/// Returns the native font that underlies this font template, if applicable. /// Returns the native font that underlies this font template, if applicable.
pub fn native_font(&self) -> Option<CGFont> { pub fn native_font(&self) -> Option<NativeFontHandle> {
self.ctfont(0.0).map(|ctfont| ctfont.copy_to_CGFont()) self.ctfont(0.0).map(|ctfont| NativeFontHandle(ctfont.copy_to_CGFont()))
} }
} }