Roll HarfBuzz to 0.9.35

third_party/harfbuzz-ng/src/hb-face.cc

 /*
  * Copyright © 2009  Red Hat, Inc.
  * Copyright © 2012  Google, 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
@@ skipping 280 matching lines @@
  * hb_face_make_immutable:
  * @face: a face.
  *
  * 
  *
  * Since: 1.0
  **/
 void
 hb_face_make_immutable (hb_face_t *face)
 {
-  if (hb_object_is_inert (face))
+  if (unlikely (hb_object_is_inert (face)))
     return;
 
   face->immutable = true;
 }
 
 /**
  * hb_face_is_immutable:
  * @face: a face.
  *
  * 
@@ skipping 49 matching lines @@
  * @index: 
  *
  * 
  *
  * Since: 1.0
  **/
 void
 hb_face_set_index (hb_face_t    *face,
                    unsigned int  index)
 {
-  if (hb_object_is_inert (face))
+  if (face->immutable)
     return;
 
   face->index = index;
 }
 
 /**
  * hb_face_get_index:
  * @face: a face.
  *
  * 
@@ skipping 14 matching lines @@
  * @upem: 
  *
  * 
  *
  * Since: 1.0
  **/
 void
 hb_face_set_upem (hb_face_t    *face,
                   unsigned int  upem)
 {
-  if (hb_object_is_inert (face))
+  if (face->immutable)
     return;
 
   face->upem = upem;
 }
 
 /**
  * hb_face_get_upem:
  * @face: a face.
  *
  * 
@@ skipping 23 matching lines @@
  * @glyph_count: 
  *
  * 
  *
  * Since: 1.0
  **/
 void
 hb_face_set_glyph_count (hb_face_t    *face,
                          unsigned int  glyph_count)
 {
-  if (hb_object_is_inert (face))
+  if (face->immutable)
     return;
 
   face->num_glyphs = glyph_count;
 }
 
 /**
  * hb_face_get_glyph_count:
  * @face: a face.
  *
  * 
@@ skipping 11 matching lines @@
 void
 hb_face_t::load_num_glyphs (void) const
 {
   hb_blob_t *maxp_blob = OT::Sanitizer<OT::maxp>::sanitize (reference_table (HB_OT_TAG_maxp));
   const OT::maxp *maxp_table = OT::Sanitizer<OT::maxp>::lock_instance (maxp_blob);
   num_glyphs = maxp_table->get_num_glyphs ();
   hb_blob_destroy (maxp_blob);
 }