jdk-sandbox: comparison src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh

equal deleted inserted replaced

-:aa0a35b071fb
+:f5b95be8b6e2
 }
 inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
 {
 TRACE_COLLECT_GLYPHS (this);
-c->output->add_array (substitute.array, substitute.len);
+c->output->add_array (substitute.arrayZ, substitute.len);
 }
 inline bool apply (hb_ot_apply_context_t *c) const
 {
 TRACE_APPLY (this);
 /* Special-case to make it in-place and not consider this
 * as a "multiplied" substitution. */
 if (unlikely (count == 1))
 {
-c->replace_glyph (substitute.array[0]);
+c->replace_glyph (substitute.arrayZ[0]);
 return_trace (true);
 }
 /* Spec disallows this, but Uniscribe allows it.
 * https://github.com/harfbuzz/harfbuzz/issues/253 */
 else if (unlikely (count == 0))
 unsigned int klass = _hb_glyph_info_is_ligature (&c->buffer->cur()) ?
 HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH : 0;
 for (unsigned int i = 0; i < count; i++) {
 _hb_glyph_info_set_lig_props_for_component (&c->buffer->cur(), i);
-c->output_glyph_for_component (substitute.array[i], klass);
+c->output_glyph_for_component (substitute.arrayZ[i], klass);
 }
 c->buffer->skip_glyph ();
 return_trace (true);
 }
 for (iter.init (this+coverage); iter.more (); iter.next ())
 {
 if (unlikely (iter.get_coverage () >= count))
 break; /* Work around malicious fonts. https://github.com/harfbuzz/harfbuzz/issues/363 */
 const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
-c->output->add_array (alt_set.array, alt_set.len);
+c->output->add_array (alt_set.arrayZ, alt_set.len);
 }
 }
 inline const Coverage &get_coverage (void) const
 {
 }
 inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
 {
 TRACE_COLLECT_GLYPHS (this);
-c->input->add_array (component.array, component.len ? component.len - 1 : 0);
+c->input->add_array (component.arrayZ, component.len ? component.len - 1 : 0);
 c->output->add (ligGlyph);
 }
 inline bool would_apply (hb_would_apply_context_t *c) const
 {
 for (unsigned int i = 0; i < count; i++)
 if (unlikely (!(this+lookahead[i]).add_coverage (c->after))) return;
 const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
 count = substitute.len;
-c->output->add_array (substitute.array, substitute.len);
+c->output->add_array (substitute.arrayZ, substitute.len);
 }
 inline const Coverage &get_coverage (void) const
 {
 return this+coverage;
 const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack);
 const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead);
 unsigned int start_index = 0, end_index = 0;
 if (match_backtrack (c,
-backtrack.len, (HBUINT16 *) backtrack.array,
+backtrack.len, (HBUINT16 *) backtrack.arrayZ,
 match_coverage, this,
 &start_index) &&
 match_lookahead (c,
-lookahead.len, (HBUINT16 *) lookahead.array,
+lookahead.len, (HBUINT16 *) lookahead.arrayZ,
 match_coverage, this,
 1, &end_index))
 {
 c->buffer->unsafe_to_break_from_outbuffer (start_index, end_index);
 c->replace_glyph_inplace (substitute[index]);
 {
 TRACE_APPLY (this);
 return_trace (dispatch (c));
 }
-inline hb_closure_context_t::return_t closure (hb_closure_context_t *c) const
+inline hb_closure_context_t::return_t closure (hb_closure_context_t *c, unsigned int this_index) const
 {
 TRACE_CLOSURE (this);
-c->set_recurse_func (dispatch_recurse_func<hb_closure_context_t>);
+if (!c->should_visit_lookup (this_index))
+return_trace (HB_VOID);
+c->set_recurse_func (dispatch_closure_recurse_func);
 return_trace (dispatch (c));
 }
 inline hb_collect_glyphs_context_t::return_t collect_glyphs (hb_collect_glyphs_context_t *c) const
 {
 component_list));
 }
 template <typename context_t>
 static inline typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index);
+static inline hb_closure_context_t::return_t dispatch_closure_recurse_func (hb_closure_context_t *c, unsigned int lookup_index)
+{
+if (!c->should_visit_lookup (lookup_index))
+return HB_VOID;
+return dispatch_recurse_func (c, lookup_index);
+}
 template <typename context_t>
 inline typename context_t::return_t dispatch (context_t *c) const
 { return Lookup::dispatch<SubstLookupSubTable> (c); }
 };
 typedef OffsetListOf<SubstLookup> SubstLookupList;
 /*
-* GSUB -- The Glyph Substitution Table
+* GSUB -- Glyph Substitution
+* https://docs.microsoft.com/en-us/typography/opentype/spec/gsub
 */
 struct GSUB : GSUBGPOS
 {
 static const hb_tag_t tableTag        = HB_OT_TAG_GSUB;

changeset 50826	f5b95be8b6e2
parent 50352	25db2c8f3cf8
child 54232	7c11a7cc7c1d