Merge 257509 "Fix unsafe shape_plan->face dependency"

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

 /*
  * Copyright © 2010  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 48 matching lines @@
 
 struct hb_ot_shape_planner_t
 {
   /* In the order that they are filled in. */
   hb_face_t *face;
   hb_segment_properties_t props;
   const struct hb_ot_complex_shaper_t *shaper;
   hb_ot_map_builder_t map;
 
   hb_ot_shape_planner_t (const hb_shape_plan_t *master_plan) :
-                         face (master_plan->face),
+                         face (master_plan->face_unsafe),
                          props (master_plan->props),
                          shaper (NULL),
                          map (face, &props) {}
   ~hb_ot_shape_planner_t (void) { map.finish (); }
 
   inline void compile (hb_ot_shape_plan_t &plan)
   {
     plan.props = props;
     plan.shaper = shaper;
     map.compile (plan.map);
   }
 
   private:
   NO_COPY (hb_ot_shape_planner_t);
 };
 
 
 #endif /* HB_OT_SHAPE_PRIVATE_HH */