walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shift code around

This commit is contained in:
Behdad Esfahbod 2018-10-23 13:09:30 -07:00
parent cf92d6579e
commit 76324d95ca
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-ot-shape.cc
View File

@ -53,6 +53,15 @@ _hb_apply_morx (hb_face_t *face)
hb_aat_layout_has_substitution (face); hb_aat_layout_has_substitution (face);
} }
hb_ot_shape_planner_t::hb_ot_shape_planner_t (const hb_shape_plan_t *master_plan) :
face (master_plan->face_unsafe),
props (master_plan->props),
map (face, &props),
apply_morx (_hb_apply_morx (face)),
shaper (apply_morx ?
&_hb_ot_complex_shaper_default :
hb_ot_shape_complex_categorize (this)) {}
void void
hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan, hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
const int *coords, const int *coords,
@ -89,7 +98,7 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
* Decide who does substitutions. GSUB, morx, or fallback. * Decide who does substitutions. GSUB, morx, or fallback.
*/ */
plan.apply_morx = _hb_apply_morx (face); plan.apply_morx = apply_morx;
/* /*
* Decide who does positioning. GPOS, kerx, kern, or fallback. * Decide who does positioning. GPOS, kerx, kern, or fallback.
@ -278,13 +287,6 @@ _hb_ot_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan,
hb_ot_shape_planner_t planner (shape_plan); hb_ot_shape_planner_t planner (shape_plan);
/* Ugly that we have to do this here...
* If we are going to apply morx, choose default shaper. */
if (_hb_apply_morx (planner.face))
planner.shaper = &_hb_ot_complex_shaper_default;
else
planner.shaper = hb_ot_shape_complex_categorize (&planner);
hb_ot_shape_collect_features (&planner, &shape_plan->props, hb_ot_shape_collect_features (&planner, &shape_plan->props,
user_features, num_user_features); user_features, num_user_features);

9
src/hb-ot-shape.hh
View File

@ -88,14 +88,11 @@ struct hb_ot_shape_planner_t
/* In the order that they are filled in. */ /* In the order that they are filled in. */
hb_face_t *face; hb_face_t *face;
hb_segment_properties_t props; hb_segment_properties_t props;
const struct hb_ot_complex_shaper_t *shaper;
hb_ot_map_builder_t map; hb_ot_map_builder_t map;
bool apply_morx : 1;
const struct hb_ot_complex_shaper_t *shaper;
hb_ot_shape_planner_t (const hb_shape_plan_t *master_plan) : HB_INTERNAL hb_ot_shape_planner_t (const hb_shape_plan_t *master_plan);
face (master_plan->face_unsafe),
props (master_plan->props),
shaper (nullptr),
map (face, &props) {}
HB_INTERNAL void compile (hb_ot_shape_plan_t &plan, HB_INTERNAL void compile (hb_ot_shape_plan_t &plan,
const int *coords, const int *coords,