From 52601275d5e4000dada4f925fb78723eeeee7bd4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 8 Oct 2010 20:38:46 -0400 Subject: [PATCH] More separation --- src/hb-ot-shape.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index e11f1c6d5..8fc9c4f58 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -79,15 +79,8 @@ hb_ot_shape_collect_features (hb_ot_shape_context_t *c) static void -hb_ot_shape_setup_lookups (hb_ot_shape_context_t *c) +hb_ot_shape_setup_masks (hb_ot_shape_context_t *c) { - hb_ot_shape_collect_features (c); - - /* Compile features */ - c->map->compile (c); - - /* Set masks in buffer */ - hb_mask_t global_mask = c->map->get_global_mask (); if (global_mask) c->buffer->set_masks (global_mask, global_mask, 0, (unsigned int) -1); @@ -278,7 +271,7 @@ hb_position_complex_fallback_visual (hb_ot_shape_context_t *c) static void hb_ot_shape_internal (hb_ot_shape_context_t *c) { - hb_ot_shape_setup_lookups (c); + hb_ot_shape_setup_masks (c); hb_form_clusters (c); @@ -335,6 +328,9 @@ hb_ot_shape (hb_font_t *font, c.original_direction = buffer->props.direction; c.map = ↦ + hb_ot_shape_collect_features (&c); + c.map->compile (&c); + hb_ot_shape_internal (&c); }