Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Harfbuzz font_funcs static

Browse source
This commit is contained in:
Matt Brubeck 2015-08-03 14:56:11 -07:00
parent f1e268b1e8
commit 47a0d494ec
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/gfx/Cargo.toml
View file

@ -13,6 +13,7 @@ bitflags = "0.3"
euclid = "0.1"
fnv = "1.0"
harfbuzz = "0.1"
lazy_static = "0.1"
libc = "0.1"
log = "0.3"
rand = "0.3"

3
components/gfx/lib.rs
View file

@ -12,6 +12,7 @@
#![feature(mpsc_select)]
#![feature(plugin)]
#![feature(str_char)]
#![feature(unique)]
#![feature(vec_push_all)]
#![plugin(plugins)]
@ -26,6 +27,8 @@ extern crate azure;
extern crate fnv;
extern crate euclid;
extern crate ipc_channel;
#[macro_use]
extern crate lazy_static;
extern crate layers;
extern crate libc;
#[macro_use]

28
components/gfx/text/shaping/harfbuzz.rs
View file

@ -149,7 +149,6 @@ struct FontAndShapingOptions {
pub struct Shaper {
hb_face: *mut hb_face_t,
hb_font: *mut hb_font_t,
hb_funcs: *mut hb_font_funcs_t,
font_and_shaping_options: Box<FontAndShapingOptions>,
}
@ -161,9 +160,6 @@ impl Drop for Shaper {
assert!(!self.hb_font.is_null());
RUST_hb_font_destroy(self.hb_font);
assert!(!self.hb_funcs.is_null());
RUST_hb_font_funcs_destroy(self.hb_funcs);
}
}
}
@ -193,18 +189,11 @@ impl Shaper {
Shaper::float_to_fixed(pt_size) as c_int);
// configure static function callbacks.
// NB. This funcs structure could be reused globally, as it never changes.
let hb_funcs: *mut hb_font_funcs_t = RUST_hb_font_funcs_create();
RUST_hb_font_funcs_set_glyph_func(hb_funcs, glyph_func, ptr::null_mut(), None);
RUST_hb_font_funcs_set_glyph_h_advance_func(hb_funcs, glyph_h_advance_func, ptr::null_mut(), None);
RUST_hb_font_funcs_set_glyph_h_kerning_func(
hb_funcs, glyph_h_kerning_func, ptr::null_mut(), ptr::null_mut());
RUST_hb_font_set_funcs(hb_font, hb_funcs, font as *mut Font as *mut c_void, None);
RUST_hb_font_set_funcs(hb_font, **HB_FONT_FUNCS, font as *mut Font as *mut c_void, None);
Shaper {
hb_face: hb_face,
hb_font: hb_font,
hb_funcs: hb_funcs,
font_and_shaping_options: font_and_shaping_options,
}
}
@ -528,7 +517,20 @@ impl Shaper {
}
}
/// Callbacks from Harfbuzz when font map and glyph advance lookup needed.
// Callbacks from Harfbuzz when font map and glyph advance lookup needed.
lazy_static! {
static ref HB_FONT_FUNCS: ptr::Unique<hb_font_funcs_t> = unsafe {
let hb_funcs = RUST_hb_font_funcs_create();
RUST_hb_font_funcs_set_glyph_func(hb_funcs, glyph_func, ptr::null_mut(), None);
RUST_hb_font_funcs_set_glyph_h_advance_func(
hb_funcs, glyph_h_advance_func, ptr::null_mut(), None);
RUST_hb_font_funcs_set_glyph_h_kerning_func(
hb_funcs, glyph_h_kerning_func, ptr::null_mut(), ptr::null_mut());
ptr::Unique::new(hb_funcs)
};
}
extern fn glyph_func(_: *mut hb_font_t,
font_data: *mut c_void,
unicode: hb_codepoint_t,