Merge 257509 "Fix unsafe shape_plan->face dependency"

third_party/harfbuzz-ng/src/hb-shape-plan.cc

 /*
  * 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
  * all copies of this software.
@@ skipping 28 matching lines @@
 static void
 hb_shape_plan_plan (hb_shape_plan_t    *shape_plan,
                     const hb_feature_t *user_features,
                     unsigned int        num_user_features,
                     const char * const *shaper_list)
 {
   const hb_shaper_pair_t *shapers = _hb_shapers_get ();
 
 #define HB_SHAPER_PLAN(shaper) \
         HB_STMT_START { \
-          if (hb_##shaper##_shaper_face_data_ensure (shape_plan->face)) { \
+          if (hb_##shaper##_shaper_face_data_ensure (shape_plan->face_unsafe)) { \
             HB_SHAPER_DATA (shaper, shape_plan) = \
               HB_SHAPER_DATA_CREATE_FUNC (shaper, shape_plan) (shape_plan, user_features, num_user_features); \
             shape_plan->shaper_func = _hb_##shaper##_shape; \
             shape_plan->shaper_name = #shaper; \
             return; \
           } \
         } HB_STMT_END
 
   if (likely (!shaper_list)) {
     for (unsigned int i = 0; i < HB_SHAPERS_COUNT; i++)
@@ skipping 50 matching lines @@
 
   if (unlikely (!face))
     face = hb_face_get_empty ();
   if (unlikely (!props || hb_object_is_inert (face)))
     return hb_shape_plan_get_empty ();
   if (!(shape_plan = hb_object_create<hb_shape_plan_t> ()))
     return hb_shape_plan_get_empty ();
 
   hb_face_make_immutable (face);
   shape_plan->default_shaper_list = shaper_list == NULL;
-  shape_plan->face = hb_face_reference (face);
+  shape_plan->face_unsafe = face;
   shape_plan->props = *props;
 
   hb_shape_plan_plan (shape_plan, user_features, num_user_features, shaper_list);
 
   return shape_plan;
 }
 
 /**
  * hb_shape_plan_get_empty:
  *
@@ skipping 52 matching lines @@
  **/
 void
 hb_shape_plan_destroy (hb_shape_plan_t *shape_plan)
 {
   if (!hb_object_destroy (shape_plan)) return;
 
 #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, shape_plan);
 #include "hb-shaper-list.hh"
 #undef HB_SHAPER_IMPLEMENT
 
-  hb_face_destroy (shape_plan->face);
-
   free (shape_plan);
 }
 
 /**
  * hb_shape_plan_set_user_data: (skip)
  * @shape_plan: a shape plan.
  * @key: 
  * @data: 
  * @destroy: 
  * @replace: 
@@ skipping 52 matching lines @@
                        hb_font_t          *font,
                        hb_buffer_t        *buffer,
                        const hb_feature_t *features,
                        unsigned int        num_features)
 {
   if (unlikely (hb_object_is_inert (shape_plan) ||
                 hb_object_is_inert (font) ||
                 hb_object_is_inert (buffer)))
     return false;
 
-  assert (shape_plan->face == font->face);
+  assert (shape_plan->face_unsafe == font->face);
   assert (hb_segment_properties_equal (&shape_plan->props, &buffer->props));
 
 #define HB_SHAPER_EXECUTE(shaper) \
         HB_STMT_START { \
           return HB_SHAPER_DATA (shaper, shape_plan) && \
                  hb_##shaper##_shaper_font_data_ensure (font) && \
                  _hb_##shaper##_shape (shape_plan, font, buffer, features, num_features); \
         } HB_STMT_END
 
   if (0)
@@ skipping 110 matching lines @@
 
   node->shape_plan = shape_plan;
   node->next = cached_plan_nodes;
 
   if (!hb_atomic_ptr_cmpexch (&face->shape_plans, cached_plan_nodes, node)) {
     hb_shape_plan_destroy (shape_plan);
     free (node);
     goto retry;
   }
 
-  /* Release our reference on face. */
-  hb_face_destroy (face);
-
   return hb_shape_plan_reference (shape_plan);
 }
 
 /**
  * hb_shape_plan_get_shaper:
  * @shape_plan: a shape plan.
  *
  * 
  *
  * Return value: (transfer none):
  *
  * Since: 1.0
  **/
 const char *
 hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan)
 {
   return shape_plan->shaper_name;
 }