Update harfbuzz-ng to 1a5a91dc0d8bf4b72a2f22dc6300b06ad7000b79.

third_party/harfbuzz-ng/src/hb-ot-layout-private.hh

 /*
- * Copyright (C) 2007,2008,2009  Red Hat, Inc.
+ * Copyright © 2007,2008,2009  Red Hat, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
  * all copies of this software.
  *
  * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
  * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
  * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
  * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
  * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
  * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * Red Hat Author(s): Behdad Esfahbod
  */
 
 #ifndef HB_OT_LAYOUT_PRIVATE_HH
 #define HB_OT_LAYOUT_PRIVATE_HH
 
-#include "hb-private.h"
+#include "hb-private.hh"
 
 #include "hb-ot-layout.h"
-#include "hb-ot-head-private.hh"
 
-#include "hb-font-private.h"
+#include "hb-font-private.hh"
 #include "hb-buffer-private.hh"
 
-HB_BEGIN_DECLS
 
 
+/*
+ * GDEF
+ */
+
 /* buffer var allocations */
 #define props_cache() var1.u16[1] /* glyph_props cache */
 
-
 /* XXX cleanup */
 typedef enum {
   HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0x0001,
   HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH   = 0x0002,
   HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE     = 0x0004,
   HB_OT_LAYOUT_GLYPH_CLASS_MARK         = 0x0008,
   HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT    = 0x0010
 } hb_ot_layout_glyph_class_t;
 
 
+HB_INTERNAL unsigned int
+_hb_ot_layout_get_glyph_property (hb_face_t       *face,
+                                  hb_glyph_info_t *info);
+
+HB_INTERNAL hb_bool_t
+_hb_ot_layout_check_glyph_property (hb_face_t    *face,
+                                    hb_glyph_info_t *ginfo,
+                                    unsigned int  lookup_props,
+                                    unsigned int *property_out);
+
+HB_INTERNAL hb_bool_t
+_hb_ot_layout_skip_mark (hb_face_t    *face,
+                         hb_glyph_info_t *ginfo,
+                         unsigned int  lookup_props,
+                         unsigned int *property_out);
+
+
+
 /*
  * hb_ot_layout_t
  */
 
 struct hb_ot_layout_t
 {
   hb_blob_t *gdef_blob;
   hb_blob_t *gsub_blob;
   hb_blob_t *gpos_blob;
 
   const struct GDEF *gdef;
   const struct GSUB *gsub;
   const struct GPOS *gpos;
 };
 
-struct hb_ot_layout_context_t
-{
-  hb_face_t *face;
-  hb_font_t *font;
-
-  /* Convert from font-space to user-space */
-  inline hb_position_t scale_x (int16_t v) { return scale (v, this->font->x_scale); }
-  inline hb_position_t scale_y (int16_t v) { return scale (v, this->font->y_scale); }
-
-  private:
-  inline hb_position_t scale (int16_t v, unsigned int scale) { return v * (int64_t) scale / this->face->head_table->get_upem (); }
-};
-
 
 HB_INTERNAL hb_ot_layout_t *
-_hb_ot_layout_new (hb_face_t *face);
+_hb_ot_layout_create (hb_face_t *face);
 
 HB_INTERNAL void
-_hb_ot_layout_free (hb_ot_layout_t *layout);
+_hb_ot_layout_destroy (hb_ot_layout_t *layout);
 
 
-/*
- * GDEF
- */
-
-HB_INTERNAL unsigned int
-_hb_ot_layout_get_glyph_property (hb_face_t       *face,
-                                  hb_glyph_info_t *info);
-
-HB_INTERNAL hb_bool_t
-_hb_ot_layout_check_glyph_property (hb_face_t    *face,
-                                    hb_glyph_info_t *ginfo,
-                                    unsigned int  lookup_props,
-                                    unsigned int *property_out);
-
-HB_INTERNAL hb_bool_t
-_hb_ot_layout_skip_mark (hb_face_t    *face,
-                         hb_glyph_info_t *ginfo,
-                         unsigned int  lookup_props,
-                         unsigned int *property_out);
-
-
-HB_END_DECLS
 
 #endif /* HB_OT_LAYOUT_PRIVATE_HH */