src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.hh

*** 22,112 ****
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
   *
   * Google Author(s): Behdad Esfahbod
   */
  
! #ifndef HB_OT_SHAPE_PRIVATE_HH
! #define HB_OT_SHAPE_PRIVATE_HH
  
! #include "hb-private.hh"
  
! #include "hb-ot-map-private.hh"
! #include "hb-ot-layout-private.hh"
  
  
  
  struct hb_ot_shape_plan_t
  {
    hb_segment_properties_t props;
    const struct hb_ot_complex_shaper_t *shaper;
    hb_ot_map_t map;
    const void *data;
!   hb_mask_t rtlm_mask, frac_mask, numr_mask, dnom_mask;
    hb_mask_t kern_mask;
!   unsigned int has_frac : 1;
!   unsigned int has_kern : 1;
!   unsigned int has_mark : 1;
  
!   inline void collect_lookups (hb_tag_t table_tag, hb_set_t *lookups) const
    {
      unsigned int table_index;
      switch (table_tag) {
        case HB_OT_TAG_GSUB: table_index = 0; break;
        case HB_OT_TAG_GPOS: table_index = 1; break;
        default: return;
      }
      map.collect_lookups (table_index, lookups);
    }
-   inline void substitute (hb_font_t *font, hb_buffer_t *buffer) const { map.substitute (this, font, buffer); }
-   inline void position (hb_font_t *font, hb_buffer_t *buffer) const { map.position (this, font, buffer); }
  
!   void init (void)
!   {
!     memset (this, 0, sizeof (*this));
!     map.init ();
!   }
!   void fini (void) {
!     map.fini ();
!   }
  };
  
  struct hb_ot_shape_planner_t
  {
    /* In the order that they are filled in. */
    hb_face_t *face;
    hb_segment_properties_t props;
-   const struct hb_ot_complex_shaper_t *shaper;
    hb_ot_map_builder_t map;
  
!   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) {}
! 
!   inline void compile (hb_ot_shape_plan_t &plan,
!                        const int          *coords,
!                        unsigned int        num_coords)
!   {
!     plan.props = props;
!     plan.shaper = shaper;
!     map.compile (plan.map, coords, num_coords);
! 
!     plan.rtlm_mask = plan.map.get_1_mask (HB_TAG ('r','t','l','m'));
!     plan.frac_mask = plan.map.get_1_mask (HB_TAG ('f','r','a','c'));
!     plan.numr_mask = plan.map.get_1_mask (HB_TAG ('n','u','m','r'));
!     plan.dnom_mask = plan.map.get_1_mask (HB_TAG ('d','n','o','m'));
! 
!     plan.kern_mask = plan.map.get_mask (HB_DIRECTION_IS_HORIZONTAL (plan.props.direction) ?
!                                         HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n'));
! 
!     plan.has_frac = plan.frac_mask || (plan.numr_mask && plan.dnom_mask);
!     plan.has_kern = !!plan.kern_mask;
!     plan.has_mark = !!plan.map.get_1_mask (HB_TAG ('m','a','r','k'));
!   }
  
!   private:
!   HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t);
  };
  
  
! #endif /* HB_OT_SHAPE_PRIVATE_HH */
--- 22,129 ----
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
   *
   * Google Author(s): Behdad Esfahbod
   */
  
! #ifndef HB_OT_SHAPE_HH
! #define HB_OT_SHAPE_HH
  
! #include "hb.hh"
  
! #include "hb-ot-map.hh"
! #include "hb-aat-map.hh"
  
  
+ struct hb_ot_shape_plan_key_t
+ {
+   unsigned int variations_index[2];
+ 
+   void init (hb_face_t   *face,
+                     const int   *coords,
+                     unsigned int num_coords)
+   {
+     for (unsigned int table_index = 0; table_index < 2; table_index++)
+       hb_ot_layout_table_find_feature_variations (face,
+                                                   table_tags[table_index],
+                                                   coords,
+                                                   num_coords,
+                                                   &variations_index[table_index]);
+   }
+ 
+   bool equal (const hb_ot_shape_plan_key_t *other)
+   {
+     return 0 == memcmp (this, other, sizeof (*this));
+   }
+ };
+ 
+ 
+ struct hb_shape_plan_key_t;
  
  struct hb_ot_shape_plan_t
  {
    hb_segment_properties_t props;
    const struct hb_ot_complex_shaper_t *shaper;
    hb_ot_map_t map;
+   hb_aat_map_t aat_map;
    const void *data;
!   hb_mask_t frac_mask, numr_mask, dnom_mask;
!   hb_mask_t rtlm_mask;
    hb_mask_t kern_mask;
!   hb_mask_t trak_mask;
! 
!   bool requested_kerning : 1;
!   bool requested_tracking : 1;
!   bool has_frac : 1;
!   bool has_gpos_mark : 1;
!   bool zero_marks : 1;
!   bool fallback_glyph_classes : 1;
!   bool fallback_mark_positioning : 1;
!   bool adjust_mark_positioning_when_zeroing : 1;
! 
!   bool apply_gpos : 1;
!   bool apply_kerx : 1;
!   bool apply_kern : 1;
!   bool apply_morx : 1;
!   bool apply_trak : 1;
  
!   void collect_lookups (hb_tag_t table_tag, hb_set_t *lookups) const
    {
      unsigned int table_index;
      switch (table_tag) {
        case HB_OT_TAG_GSUB: table_index = 0; break;
        case HB_OT_TAG_GPOS: table_index = 1; break;
        default: return;
      }
      map.collect_lookups (table_index, lookups);
    }
  
!   HB_INTERNAL bool init0 (hb_face_t                     *face,
!                           const hb_shape_plan_key_t     *key);
!   HB_INTERNAL void fini ();
! 
!   HB_INTERNAL void substitute (hb_font_t *font, hb_buffer_t *buffer) const;
!   HB_INTERNAL void position (hb_font_t *font, hb_buffer_t *buffer) const;
  };
  
+ struct hb_shape_plan_t;
+ 
  struct hb_ot_shape_planner_t
  {
    /* In the order that they are filled in. */
    hb_face_t *face;
    hb_segment_properties_t props;
    hb_ot_map_builder_t map;
+   hb_aat_map_builder_t aat_map;
+   bool apply_morx : 1;
+   bool script_zero_marks : 1;
+   bool script_fallback_mark_positioning : 1;
+   const struct hb_ot_complex_shaper_t *shaper;
  
!   HB_INTERNAL hb_ot_shape_planner_t (hb_face_t                     *face,
!                                      const hb_segment_properties_t *props);
  
!   HB_INTERNAL void compile (hb_ot_shape_plan_t           &plan,
!                             const hb_ot_shape_plan_key_t &key);
  };
  
  
! #endif /* HB_OT_SHAPE_HH */