[subset] Remove add accelerator flag, replace with new api method.
Adds hb_subset_preprocess() which preprocesses the face and attaches accelerator data.
diff --git a/perf/benchmark-subset.cc b/perf/benchmark-subset.cc
index 7c65788..9bf3447 100644
--- a/perf/benchmark-subset.cc
+++ b/perf/benchmark-subset.cc
@@ -101,37 +101,9 @@
// the subsetting operations.
static hb_face_t* preprocess_face(hb_face_t* face)
{
- hb_subset_input_t* input = hb_subset_input_create_or_fail ();
-
- hb_set_clear (hb_subset_input_set(input, HB_SUBSET_SETS_UNICODE));
- hb_set_invert (hb_subset_input_set(input, HB_SUBSET_SETS_UNICODE));
-
- hb_set_clear (hb_subset_input_set(input,
- HB_SUBSET_SETS_LAYOUT_FEATURE_TAG));
- hb_set_invert (hb_subset_input_set(input,
- HB_SUBSET_SETS_LAYOUT_FEATURE_TAG));
-
- hb_set_clear (hb_subset_input_set(input,
- HB_SUBSET_SETS_LAYOUT_SCRIPT_TAG));
- hb_set_invert (hb_subset_input_set(input,
- HB_SUBSET_SETS_LAYOUT_SCRIPT_TAG));
-
- hb_set_clear (hb_subset_input_set(input,
- HB_SUBSET_SETS_NAME_ID));
- hb_set_invert (hb_subset_input_set(input,
- HB_SUBSET_SETS_NAME_ID));
-
- hb_subset_input_set_flags(input,
- HB_SUBSET_FLAGS_NOTDEF_OUTLINE |
- HB_SUBSET_FLAGS_GLYPH_NAMES |
- HB_SUBSET_FLAGS_RETAIN_GIDS |
- HB_SUBSET_FLAGS_ADD_ACCELERATOR_DATA);
-
- hb_face_t* subset = hb_subset_or_fail (face, input);
- hb_face_destroy (face);
- hb_subset_input_destroy (input);
-
- return subset;
+ hb_face_t* new_face = hb_subset_preprocess(face);
+ hb_face_destroy(face);
+ return new_face;
}
/* benchmark for subsetting a font */
