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

Ensure FontHandles on Linux don't outlast the FreeType library reference.

Browse source
This commit is contained in:
Josh Matthews 2013-05-22 13:55:51 -04:00
parent 52a0164022
commit a43f92a300
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/components/servo-gfx/platform/linux/font.rs
View file

@ -53,6 +53,7 @@ pub struct FontHandle {
// if the font is created using FT_Memory_Face. // if the font is created using FT_Memory_Face.
source: FontSource, source: FontSource,
face: FT_Face, face: FT_Face,
handle: FontContextHandle
} }
#[unsafe_destructor] #[unsafe_destructor]
@ -81,7 +82,14 @@ impl FontHandleMethods for FontHandle {
// and moving buf into the struct ctor, but cant' move out of // and moving buf into the struct ctor, but cant' move out of
// captured binding. // captured binding.
return match face_result { return match face_result {
Ok(face) => Ok(FontHandle { face: face, source: FontSourceMem(buf) }), Ok(face) => {
let handle = FontHandle {
face: face,
source: FontSourceMem(buf),
handle: *fctx
};
Ok(handle)
}
Err(()) => Err(()) Err(()) => Err(())
}; };
@ -247,7 +255,11 @@ pub impl<'self> FontHandle {
return Err(()); return Err(());
} }
if FontHandle::set_char_size(face, style.pt_size).is_ok() { if FontHandle::set_char_size(face, style.pt_size).is_ok() {
Ok(FontHandle { source: FontSourceFile(file), face: face }) Ok(FontHandle {
source: FontSourceFile(file),
face: face,
handle: *fctx
})
} else { } else {
Err(()) Err(())
} }
@ -268,7 +280,11 @@ pub impl<'self> FontHandle {
return Err(()); return Err(());
} }
Ok(FontHandle { source: FontSourceFile(file), face: face }) Ok(FontHandle {
source: FontSourceFile(file),
face: face,
handle: *fctx
})
} }
priv fn get_face_rec(&'self self) -> &'self FT_FaceRec { priv fn get_face_rec(&'self self) -> &'self FT_FaceRec {