commit a78d2f27ab67e4e09e7cdefe4b6941082f44620a
author Behdad Esfahbod <behdad@behdad.org> Mon May 05 18:32:02 2025 -0600
committer Behdad Esfahbod <behdad@behdad.org> Tue May 06 10:38:47 2025 -0600
tree a96d6c48f00358a2ff35652bf56929d0ec75866f
parent b50b5a0db1f69f7ca64a57663ccca6684a8b6330

[harfruzz] Cache Face

src/rust/shape.rs

diff --git a/src/rust/shape.rs b/src/rust/shape.rs
index 823591b..2e66de0 100644
--- a/src/rust/shape.rs
+++ b/src/rust/shape.rs
@@ -7,12 +7,11 @@
 use std::str::FromStr;
 
 use font_types::Tag;
-use harfruzz::{Direction, FontRef, Language, Script, ShaperFont};
+use harfruzz::{Direction, Face, FontRef, Language, Script, ShaperFont};
 
 pub struct HBHarfRuzzFaceData<'a> {
     face_blob: *mut hb_blob_t,
-    font_ref: FontRef<'a>,
-    shaper_font: ShaperFont,
+    face: Face<'a>,
 }
 
 #[no_mangle]
@@ -28,12 +27,9 @@
     let font_ref = FontRef::from_index(face_data, face_index)
         .expect("FontRef::from_index should succeed on valid HarfBuzz face data");
     let shaper_font = ShaperFont::new(&font_ref);
+    let face = shaper_font.shaper(&font_ref, &[]);
 
-    let hr_face_data = HBHarfRuzzFaceData {
-        face_blob,
-        font_ref,
-        shaper_font,
-    };
+    let hr_face_data = HBHarfRuzzFaceData { face_blob, face };
     let hr_face_data_ptr = Box::into_raw(Box::new(hr_face_data));
     hr_face_data_ptr as *mut c_void
 }
@@ -99,11 +95,9 @@
         hr_buffer.add(char::from_u32_unchecked(unicode), cluster);
     }
 
-    let font_ref = &(*data).font_ref;
-    let shaper_font = &(*data).shaper_font;
-    let face = shaper_font.shaper(font_ref, &[]);
+    let face = &(*data).face;
 
-    let glyphs = harfruzz::shape(&face, &[], hr_buffer);
+    let glyphs = harfruzz::shape(face, &[], hr_buffer);
 
     let count = glyphs.len();
     hb_buffer_set_content_type(