Roll harfbuzz-ng 3b8fd9c48f4bde368bf2d465c148b9743a9216ee

third_party/harfbuzz-ng/src/hb-ot-shape-normalize-private.hh

Index: third_party/harfbuzz-ng/src/hb-ot-shape-normalize-private.hh
diff --git a/third_party/harfbuzz-ng/src/hb-fallback-shape-private.hh b/third_party/harfbuzz-ng/src/hb-ot-shape-normalize-private.hh
similarity index 64%
copy from third_party/harfbuzz-ng/src/hb-fallback-shape-private.hh
copy to third_party/harfbuzz-ng/src/hb-ot-shape-normalize-private.hh
index d0beb16dec680c23dcc51aef983bcff398555aa6..bb81f00ef81eea78ece5ce42f9a70b9f66128629 100644
--- a/third_party/harfbuzz-ng/src/hb-fallback-shape-private.hh
+++ b/third_party/harfbuzz-ng/src/hb-ot-shape-normalize-private.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011  Google, Inc.
+ * Copyright © 2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
@@ -24,25 +24,23 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_FALLBACK_SHAPE_PRIVATE_HH
-#define HB_FALLBACK_SHAPE_PRIVATE_HH
+#ifndef HB_OT_SHAPE_NORMALIZE_PRIVATE_HH
+#define HB_OT_SHAPE_NORMALIZE_PRIVATE_HH
 
 #include "hb-private.hh"
 
-#include "hb-shape.h"
+#include "hb-font.h"
+#include "hb-buffer.h"
 
 
-HB_BEGIN_DECLS
+enum hb_ot_shape_normalization_mode_t {
+  HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED,
+  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS, /* never composes base-to-base */
+  HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL /* including base-to-base composition */
+};
 
+HB_INTERNAL void _hb_ot_shape_normalize (hb_font_t *font,
+					 hb_buffer_t *buffer,
+					 hb_ot_shape_normalization_mode_t mode);
 
-HB_INTERNAL hb_bool_t
-hb_fallback_shape (hb_font_t          *font,
-		   hb_buffer_t        *buffer,
-		   const hb_feature_t *features,
-		   unsigned int        num_features,
-		   const char * const *shaper_options);
-
-
-HB_END_DECLS
-
-#endif /* HB_FALLBACK_SHAPE_PRIVATE_HH */
+#endif /* HB_OT_SHAPE_NORMALIZE_PRIVATE_HH */