Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Switch QuartzFontHandle to use RAII CGDataProvider bindings.

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 46867310961b82de630c34d84ac1e8cb643c64ba
This commit is contained in:
Brian J. Burg 2012-11-08 17:57:56 -08:00
parent 50af6272cc
commit 9a79f7ab30
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servo/src/servo/gfx/font.rs
View File

@ -34,7 +34,7 @@ pub type FontHandle/& = freetype::font::FreeTypeFontHandle;
impl FontHandle {
#[cfg(target_os = "macos")]
static pub fn new(fctx: &native::FontContextHandle, buf: @~[u8], pt_size: float) -> Result<FontHandle, ()> {
quartz::font::QuartzFontHandle::new(fctx, buf, pt_size)
quartz::font::QuartzFontHandle::new_from_buffer(fctx, buf, pt_size)
}
#[cfg(target_os = "linux")]

25
servo/src/servo/gfx/quartz/font.rs
View File

@ -20,9 +20,7 @@ use cf::string::UniChar;
use cg = core_graphics;
use cg::base::{CGFloat, CGAffineTransform};
use cg::data_provider::{
CGDataProviderCreateWithData,
CGDataProviderRef,
CGDataProviderRelease,
CGDataProviderRef, CGDataProvider
};
use cg::font::{
CGFontCreateWithDataProvider,
@ -52,43 +50,36 @@ use ct::font_descriptor::{
};
pub struct QuartzFontHandle {
fontprov: CGDataProviderRef,
cgfont: CGFontRef,
ctfont: CTFontRef,
drop {
assert self.ctfont.is_not_null();
assert self.cgfont.is_not_null();
assert self.fontprov.is_not_null();
CFRelease(self.ctfont as CFTypeRef);
CGFontRelease(self.cgfont);
CGDataProviderRelease(self.fontprov);
}
}
pub impl QuartzFontHandle {
static pub fn new(_fctx: &QuartzFontContextHandle, buf: @~[u8], pt_size: float) -> Result<QuartzFontHandle, ()> {
static pub fn new_from_buffer(_fctx: &QuartzFontContextHandle, buf: @~[u8], pt_size: float) -> Result<QuartzFontHandle, ()> {
let fontprov = vec::as_imm_buf(*buf, |cbuf, len| {
CGDataProviderCreateWithData(
ptr::null(),
unsafe { cast::transmute(copy cbuf) },
len as size_t,
ptr::null())
CGDataProvider::new_from_buffer(cbuf, len)
});
if fontprov.is_null() { return Err(()); }
let cgfont = CGFontCreateWithDataProvider(fontprov);
let cgfont = CGFontCreateWithDataProvider(fontprov.get_ref());
if cgfont.is_null() { return Err(()); }
let ctfont = ctfont_from_cgfont(cgfont, pt_size);
if ctfont.is_null() { return Err(()); }
Ok(QuartzFontHandle {
fontprov : fontprov,
let result = Ok(QuartzFontHandle {
cgfont : cgfont,
ctfont : ctfont,
})
});
return move result;
}
fn glyph_index(codepoint: char) -> Option<GlyphIndex> {