commit 622a68695256d8505517ed58885b94b8520efe07
author Behdad Esfahbod <behdad@behdad.org> Mon Jan 09 18:14:40 2023 -0700
committer Behdad Esfahbod <behdad@behdad.org> Mon Jan 09 21:16:20 2023 -0700
tree a98b2d9be5b37e7a7f68d91a1cada8724b4d7389
parent 0f01a8362221129729553b3b0f87bff812b32d14

Revert "Revert "Revert "[aat] Allow disable feature ranges"""

This reverts commit 5202053c2c5fb2c8af9704e690b25a26bf2a0295.

src/hb-aat-map.hh

diff --git a/src/hb-aat-map.hh b/src/hb-aat-map.hh
index 1ed9169..d0ee7d6 100644
--- a/src/hb-aat-map.hh
+++ b/src/hb-aat-map.hh
@@ -29,8 +29,6 @@
 
 #include "hb.hh"
 
-#include "hb-ot-map.hh"
-
 
 struct hb_aat_map_t
 {
@@ -38,21 +36,15 @@
 
   public:
 
-  struct chain_info_t
-  {
-    hb_mask_t flags;
-    hb_mask_t mask;
-  };
-
   void init ()
   {
     hb_memset (this, 0, sizeof (*this));
-    chain_info.init ();
+    chain_flags.init ();
   }
-  void fini () { chain_info.fini (); }
+  void fini () { chain_flags.fini (); }
 
   public:
-  hb_vector_t<chain_info_t> chain_info;
+  hb_vector_t<hb_mask_t> chain_flags;
 };
 
 struct hb_aat_map_builder_t
@@ -66,12 +58,11 @@
 
   HB_INTERNAL void add_feature (hb_tag_t tag, unsigned int value=1);
 
-  HB_INTERNAL void compile (hb_aat_map_t &m, const hb_ot_map_t &ot_m);
+  HB_INTERNAL void compile (hb_aat_map_t  &m);
 
   public:
   struct feature_info_t
   {
-    hb_tag_t tag;
     hb_aat_layout_feature_type_t  type;
     hb_aat_layout_feature_selector_t  setting;
     bool is_exclusive;