Index: third_party/harfbuzz-ng/src/hb-ot-layout-gpos-table.hh |
diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout-gpos-table.hh b/third_party/harfbuzz-ng/src/hb-ot-layout-gpos-table.hh |
index 8e2860c9131cedef1f23e7f3690c57ded986a1e7..4255f5a8aeac68294ffdc026c866227dd7e7a150 100644 |
--- a/third_party/harfbuzz-ng/src/hb-ot-layout-gpos-table.hh |
+++ b/third_party/harfbuzz-ng/src/hb-ot-layout-gpos-table.hh |
@@ -345,8 +345,8 @@ struct AnchorMatrix |
inline const Anchor& get_anchor (unsigned int row, unsigned int col, unsigned int cols, bool *found) const { |
*found = false; |
if (unlikely (row >= rows || col >= cols)) return Null(Anchor); |
- *found = !matrix[row * cols + col].is_null (); |
- return this+matrix[row * cols + col]; |
+ *found = !matrixZ[row * cols + col].is_null (); |
+ return this+matrixZ[row * cols + col]; |
} |
inline bool sanitize (hb_sanitize_context_t *c, unsigned int cols) { |
@@ -354,19 +354,19 @@ struct AnchorMatrix |
if (!c->check_struct (this)) return TRACE_RETURN (false); |
if (unlikely (rows > 0 && cols >= ((unsigned int) -1) / rows)) return TRACE_RETURN (false); |
unsigned int count = rows * cols; |
- if (!c->check_array (matrix, matrix[0].static_size, count)) return TRACE_RETURN (false); |
+ if (!c->check_array (matrixZ, matrixZ[0].static_size, count)) return TRACE_RETURN (false); |
for (unsigned int i = 0; i < count; i++) |
- if (!matrix[i].sanitize (c, this)) return TRACE_RETURN (false); |
+ if (!matrixZ[i].sanitize (c, this)) return TRACE_RETURN (false); |
return TRACE_RETURN (true); |
} |
USHORT rows; /* Number of rows */ |
protected: |
OffsetTo<Anchor> |
- matrix[VAR]; /* Matrix of offsets to Anchor tables-- |
+ matrixZ[VAR]; /* Matrix of offsets to Anchor tables-- |
* from beginning of AnchorMatrix table */ |
public: |
- DEFINE_SIZE_ARRAY (2, matrix); |
+ DEFINE_SIZE_ARRAY (2, matrixZ); |
}; |
@@ -530,7 +530,7 @@ struct SinglePos |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, u.format); |
switch (u.format) { |
case 1: return TRACE_RETURN (c->dispatch (u.format1)); |
case 2: return TRACE_RETURN (c->dispatch (u.format2)); |
@@ -583,7 +583,7 @@ struct PairSet |
unsigned int len2 = valueFormats[1].get_len (); |
unsigned int record_size = USHORT::static_size * (1 + len1 + len2); |
- const PairValueRecord *record = CastP<PairValueRecord> (array); |
+ const PairValueRecord *record = CastP<PairValueRecord> (arrayZ); |
unsigned int count = len; |
for (unsigned int i = 0; i < count; i++) |
{ |
@@ -602,7 +602,7 @@ struct PairSet |
unsigned int len2 = valueFormats[1].get_len (); |
unsigned int record_size = USHORT::static_size * (1 + len1 + len2); |
- const PairValueRecord *record = CastP<PairValueRecord> (array); |
+ const PairValueRecord *record = CastP<PairValueRecord> (arrayZ); |
unsigned int count = len; |
for (unsigned int i = 0; i < count; i++) |
{ |
@@ -634,20 +634,20 @@ struct PairSet |
inline bool sanitize (hb_sanitize_context_t *c, const sanitize_closure_t *closure) { |
TRACE_SANITIZE (this); |
if (!(c->check_struct (this) |
- && c->check_array (array, USHORT::static_size * closure->stride, len))) return TRACE_RETURN (false); |
+ && c->check_array (arrayZ, USHORT::static_size * closure->stride, len))) return TRACE_RETURN (false); |
unsigned int count = len; |
- PairValueRecord *record = CastP<PairValueRecord> (array); |
+ PairValueRecord *record = CastP<PairValueRecord> (arrayZ); |
return TRACE_RETURN (closure->valueFormats[0].sanitize_values_stride_unsafe (c, closure->base, &record->values[0], count, closure->stride) |
&& closure->valueFormats[1].sanitize_values_stride_unsafe (c, closure->base, &record->values[closure->len1], count, closure->stride)); |
} |
protected: |
USHORT len; /* Number of PairValueRecords */ |
- USHORT array[VAR]; /* Array of PairValueRecords--ordered |
+ USHORT arrayZ[VAR]; /* Array of PairValueRecords--ordered |
* by GlyphID of the second glyph */ |
public: |
- DEFINE_SIZE_ARRAY (2, array); |
+ DEFINE_SIZE_ARRAY (2, arrayZ); |
}; |
struct PairPosFormat1 |
@@ -822,7 +822,7 @@ struct PairPos |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, u.format); |
switch (u.format) { |
case 1: return TRACE_RETURN (c->dispatch (u.format1)); |
case 2: return TRACE_RETURN (c->dispatch (u.format2)); |
@@ -989,7 +989,7 @@ struct CursivePos |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, u.format); |
switch (u.format) { |
case 1: return TRACE_RETURN (c->dispatch (u.format1)); |
default:return TRACE_RETURN (c->default_return_value ()); |
@@ -1088,7 +1088,7 @@ struct MarkBasePos |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, u.format); |
switch (u.format) { |
case 1: return TRACE_RETURN (c->dispatch (u.format1)); |
default:return TRACE_RETURN (c->default_return_value ()); |
@@ -1209,7 +1209,7 @@ struct MarkLigPos |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, u.format); |
switch (u.format) { |
case 1: return TRACE_RETURN (c->dispatch (u.format1)); |
default:return TRACE_RETURN (c->default_return_value ()); |
@@ -1328,7 +1328,7 @@ struct MarkMarkPos |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, u.format); |
switch (u.format) { |
case 1: return TRACE_RETURN (c->dispatch (u.format1)); |
default:return TRACE_RETURN (c->default_return_value ()); |
@@ -1387,7 +1387,7 @@ struct PosLookupSubTable |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const |
{ |
- TRACE_DISPATCH (this); |
+ TRACE_DISPATCH (this, lookup_type); |
switch (lookup_type) { |
case Single: return TRACE_RETURN (u.single.dispatch (c)); |
case Pair: return TRACE_RETURN (u.pair.dispatch (c)); |
@@ -1488,8 +1488,8 @@ struct PosLookup : Lookup |
template <typename context_t> |
inline typename context_t::return_t dispatch (context_t *c) const |
{ |
- TRACE_DISPATCH (this); |
unsigned int lookup_type = get_type (); |
+ TRACE_DISPATCH (this, lookup_type); |
unsigned int count = get_subtable_count (); |
for (unsigned int i = 0; i < count; i++) { |
typename context_t::return_t r = get_subtable (i).dispatch (c, lookup_type); |