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

Only include the test font once

Browse source
This commit is contained in:
Brian Anderson 2012-06-15 23:37:33 -07:00
parent 25e6db150e
commit 50a0956f1b
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/servo/gfx/renderer.rs
View file

@ -182,7 +182,7 @@ fn draw_some_text(draw_target: AzDrawTargetRef) {
//let library: ft::FT_Library = ptr::null(); //let library: ft::FT_Library = ptr::null();
//ftbg::FT_Init_FreeType(ptr::addr_of(library)).for_sure(); //ftbg::FT_Init_FreeType(ptr::addr_of(library)).for_sure();
let fontbin = #include_bin("JosefinSans-SemiBold.ttf"); let fontbin = text::font::test_font_bin();
let fontprov = vec::as_buf(fontbin) {|buf| let fontprov = vec::as_buf(fontbin) {|buf|
CGDataProviderCreateWithData(ptr::null(), CGDataProviderCreateWithData(ptr::null(),
@ -326,7 +326,7 @@ fn draw_some_text(draw_target: AzDrawTargetRef) {
let library: ft::FT_Library = ptr::null(); let library: ft::FT_Library = ptr::null();
ftbg::FT_Init_FreeType(ptr::addr_of(library)).for_sure(); ftbg::FT_Init_FreeType(ptr::addr_of(library)).for_sure();
let fontbin = #include_bin("JosefinSans-SemiBold.ttf"); let fontbin = text::font::test_font_bin();
let face: ft::FT_Face = ptr::null(); let face: ft::FT_Face = ptr::null();
vec::as_buf(fontbin) {|buf| vec::as_buf(fontbin) {|buf|

11
src/servo/text/font.rs
View file

@ -1,4 +1,4 @@
export font, create_test_font; export font, create_test_font, test_font_bin;
import libc::{ c_int, c_double }; import libc::{ c_int, c_double };
import ptr::{ null, addr_of }; import ptr::{ null, addr_of };
@ -178,10 +178,11 @@ fn get_cairo_face(buf: &[u8]) -> (*cairo_font_face_t, fn@()) {
} }
fn create_test_font() -> font { fn create_test_font() -> font {
let buf = #include_bin("JosefinSans-SemiBold.ttf"); font(test_font_bin())
font(buf)
} }
fn test_font_bin() -> [u8] { #include_bin("JosefinSans-SemiBold.ttf") }
fn should_destruct_on_fail_without_leaking() { fn should_destruct_on_fail_without_leaking() {
#[test]; #[test];
#[should_fail]; #[should_fail];
@ -227,7 +228,7 @@ fn get_cairo_face_should_fail_and_not_leak_if_font_cant_be_created() {
fn get_cairo_face_should_return_a_new_face_and_dtor() { fn get_cairo_face_should_return_a_new_face_and_dtor() {
#[test]; #[test];
let buf = #include_bin("JosefinSans-SemiBold.ttf"); let buf = test_font_bin();
let (face, dtor) = get_cairo_face(&buf); let (face, dtor) = get_cairo_face(&buf);
assert face.is_not_null(); assert face.is_not_null();
dtor(); dtor();
@ -236,7 +237,7 @@ fn get_cairo_face_should_return_a_new_face_and_dtor() {
fn get_cairo_font_should_return_a_new_font_and_dtor() { fn get_cairo_font_should_return_a_new_font_and_dtor() {
#[test]; #[test];
let buf = #include_bin("JosefinSans-SemiBold.ttf"); let buf = test_font_bin();
let (font, dtor) = get_cairo_font(&buf); let (font, dtor) = get_cairo_font(&buf);
assert font.is_not_null(); assert font.is_not_null();
dtor(); dtor();