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

[shape-plan] Only use shape-plan key to initialize hb_ot_shape_plan_t 

Such that we don't accidentally use info not in the cache key.
This commit is contained in:
Behdad Esfahbod 2018-11-12 18:05:02 -05:00
parent 7ac03f88a2
commit 1082338525
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,6 @@
static void static void
hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner, hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner,
const hb_segment_properties_t *props,
const hb_feature_t *user_features, const hb_feature_t *user_features,
unsigned int num_user_features); unsigned int num_user_features);
@ -150,21 +149,20 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
bool bool
hb_ot_shape_plan_t::init0 (hb_face_t *face, hb_ot_shape_plan_t::init0 (hb_face_t *face,
const hb_segment_properties_t *props, const hb_shape_plan_key_t *key)
const hb_feature_t *user_features,
unsigned int num_user_features,
const int *coords,
unsigned int num_coords)
{ {
map.init (); map.init ();
aat_map.init (); aat_map.init ();
hb_ot_shape_planner_t planner (face, props); hb_ot_shape_planner_t planner (face,
&key->props);
hb_ot_shape_collect_features (&planner,
key->user_features,
key->num_user_features);
hb_ot_shape_collect_features (&planner, props, planner.compile (*this,
user_features, num_user_features); key->coords,
key->num_coords);
planner.compile (*this, coords, num_coords);
if (shaper->data_create) if (shaper->data_create)
{ {
@ -211,7 +209,6 @@ horizontal_features[] =
static void static void
hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner, hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner,
const hb_segment_properties_t *props,
const hb_feature_t *user_features, const hb_feature_t *user_features,
unsigned int num_user_features) unsigned int num_user_features)
{ {
@ -220,7 +217,7 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner,
map->enable_feature (HB_TAG('r','v','r','n')); map->enable_feature (HB_TAG('r','v','r','n'));
map->add_gsub_pause (nullptr); map->add_gsub_pause (nullptr);
switch (props->direction) { switch (planner->props.direction) {
case HB_DIRECTION_LTR: case HB_DIRECTION_LTR:
map->enable_feature (HB_TAG ('l','t','r','a')); map->enable_feature (HB_TAG ('l','t','r','a'));
map->enable_feature (HB_TAG ('l','t','r','m')); map->enable_feature (HB_TAG ('l','t','r','m'));
@ -259,7 +256,7 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner,
for (unsigned int i = 0; i < ARRAY_LENGTH (common_features); i++) for (unsigned int i = 0; i < ARRAY_LENGTH (common_features); i++)
map->add_feature (common_features[i]); map->add_feature (common_features[i]);
if (HB_DIRECTION_IS_HORIZONTAL (props->direction)) if (HB_DIRECTION_IS_HORIZONTAL (planner->props.direction))
for (unsigned int i = 0; i < ARRAY_LENGTH (horizontal_features); i++) for (unsigned int i = 0; i < ARRAY_LENGTH (horizontal_features); i++)
map->add_feature (horizontal_features[i]); map->add_feature (horizontal_features[i]);
else else

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

@ -33,6 +33,8 @@
#include "hb-aat-map.hh" #include "hb-aat-map.hh"
struct hb_shape_plan_key_t;
struct hb_ot_shape_plan_t struct hb_ot_shape_plan_t
{ {
hb_segment_properties_t props; hb_segment_properties_t props;
@ -74,11 +76,7 @@ struct hb_ot_shape_plan_t
inline void position (hb_font_t *font, hb_buffer_t *buffer) const { map.position (this, font, buffer); } inline void position (hb_font_t *font, hb_buffer_t *buffer) const { map.position (this, font, buffer); }
HB_INTERNAL bool init0 (hb_face_t *face, HB_INTERNAL bool init0 (hb_face_t *face,
const hb_segment_properties_t *props, const hb_shape_plan_key_t *key);
const hb_feature_t *user_features,
unsigned int num_user_features,
const int *coords,
unsigned int num_coords);
HB_INTERNAL void fini (void); HB_INTERNAL void fini (void);
}; };

7
src/hb-shape-plan.cc
View File

@ -194,12 +194,7 @@ hb_shape_plan_create2 (hb_face_t *face,
num_coords, num_coords,
shaper_list))) shaper_list)))
goto bail2; goto bail2;
if (unlikely (!shape_plan->ot.init0 (face, if (unlikely (!shape_plan->ot.init0 (face, &shape_plan->key)))
props,
user_features,
num_user_features,
coords,
num_coords)))
goto bail3; goto bail3;
return shape_plan; return shape_plan;