harfbuzz-ng roll

third_party/harfbuzz-ng/src/hb-shaper-list.hh

Index: third_party/harfbuzz-ng/src/hb-shaper-list.hh
diff --git a/third_party/harfbuzz-ng/src/hb-graphite2-private.hh b/third_party/harfbuzz-ng/src/hb-shaper-list.hh
similarity index 64%
rename from third_party/harfbuzz-ng/src/hb-graphite2-private.hh
rename to third_party/harfbuzz-ng/src/hb-shaper-list.hh
index 644ea7565eebe12dec456b9bc6b89850436a1b76..6c02de46d2cfa38d6f936e86dd75a58b9abe2e09 100644
--- a/third_party/harfbuzz-ng/src/hb-graphite2-private.hh
+++ b/third_party/harfbuzz-ng/src/hb-shaper-list.hh
@@ -24,19 +24,31 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_GRAPHITE2_PRIVATE_HH
-#define HB_GRAPHITE2_PRIVATE_HH
+#ifndef HB_SHAPER_LIST_HH
+#define HB_SHAPER_LIST_HH
+#endif /* HB_SHAPER_LIST_HH */ /* Dummy header guards */
 
-#include "hb-private.hh"
+/* v--- Add new shapers in the right place here. */
+#ifdef HAVE_GRAPHITE2
+HB_SHAPER_IMPLEMENT (graphite2)
+#endif
+#ifdef HAVE_UNISCRIBE
+HB_SHAPER_IMPLEMENT (uniscribe)
+#endif
+#ifdef HAVE_CORETEXT
+HB_SHAPER_IMPLEMENT (coretext)
+#endif
 
-#include "hb-graphite2.h"
+#ifdef HAVE_OT
+HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */
+#endif
 
+#ifdef HAVE_HB_OLD
+HB_SHAPER_IMPLEMENT (old)
+#endif
 
-HB_INTERNAL hb_bool_t
-_hb_graphite2_shape (hb_font_t          *font,
-		     hb_buffer_t        *buffer,
-		     const hb_feature_t *features,
-		     unsigned int        num_features);
+#ifdef HAVE_ICU_LE
+HB_SHAPER_IMPLEMENT (icu_le)
+#endif
 
-
-#endif /* HB_GRAPHITE2_PRIVATE_HH */
+HB_SHAPER_IMPLEMENT (fallback) /* <--- This should be last. */