Roll harfbuzz-ng to 1.0.5

third_party/harfbuzz-ng/src/hb-open-file-private.hh

 /*
  * Copyright © 2007,2008,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 38 matching lines @@
 struct OpenTypeFontFile;
 struct OffsetTable;
 struct TTCHeader;
 
 
 typedef struct TableRecord
 {
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (c->check_struct (this));
+    return_trace (c->check_struct (this));
   }
 
   Tag           tag;            /* 4-byte identifier. */
   CheckSum      checkSum;       /* CheckSum for this table. */
   ULONG         offset;         /* Offset from beginning of TrueType font
                                  * file. */
   ULONG         length;         /* Length of this table. */
   public:
   DEFINE_SIZE_STATIC (16);
 } OpenTypeTable;
@@ skipping 29 matching lines @@
   {
     unsigned int table_index;
     find_table_index (tag, &table_index);
     return get_table (table_index);
   }
 
   public:
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables));
+    return_trace (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables));
   }
 
   protected:
   Tag           sfnt_version;   /* '\0\001\0\00' if TrueType / 'OTTO' if CFF */
   USHORT        numTables;      /* Number of tables. */
   USHORT        searchRangeZ;   /* (Maximum power of 2 <= numTables) x 16 */
   USHORT        entrySelectorZ; /* Log2(maximum power of 2 <= numTables). */
   USHORT        rangeShiftZ;    /* NumTables x 16-searchRange. */
   TableRecord   tables[VAR];    /* TableRecord entries. numTables items */
   public:
   DEFINE_SIZE_ARRAY (12, tables);
 } OpenTypeFontFace;
 
 
 /*
  * TrueType Collections
  */
 
 struct TTCHeaderVersion1
 {
   friend struct TTCHeader;
 
   inline unsigned int get_face_count (void) const { return table.len; }
   inline const OpenTypeFontFace& get_face (unsigned int i) const { return this+table[i]; }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (table.sanitize (c, this));
+    return_trace (table.sanitize (c, this));
   }
 
   protected:
   Tag           ttcTag;         /* TrueType Collection ID string: 'ttcf' */
   FixedVersion  version;        /* Version of the TTC Header (1.0),
                                  * 0x00010000u */
   ArrayOf<OffsetTo<OffsetTable, ULONG>, ULONG>
                 table;          /* Array of offsets to the OffsetTable for each font
                                  * from the beginning of the file */
   public:
@@ skipping 19 matching lines @@
     switch (u.header.version.major) {
     case 2: /* version 2 is compatible with version 1 */
     case 1: return u.version1.get_face (i);
     default:return Null(OpenTypeFontFace);
     }
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.header.version.sanitize (c))) return TRACE_RETURN (false);
+    if (unlikely (!u.header.version.sanitize (c))) return_trace (false);
     switch (u.header.version.major) {
     case 2: /* version 2 is compatible with version 1 */
-    case 1: return TRACE_RETURN (u.version1.sanitize (c));
-    default:return TRACE_RETURN (true);
+    case 1: return_trace (u.version1.sanitize (c));
+    default:return_trace (true);
     }
   }
 
   protected:
   union {
   struct {
   Tag           ttcTag;         /* TrueType Collection ID string: 'ttcf' */
   FixedVersion  version;        /* Version of the TTC Header (1.0 or 2.0),
                                  * 0x00010000u or 0x00020000u */
   }                     header;
@@ skipping 40 matching lines @@
     case Typ1Tag:
     case TrueTypeTag:   return u.fontFace;
     case TTCTag:        return u.ttcHeader.get_face (i);
     default:            return Null(OpenTypeFontFace);
     }
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.tag.sanitize (c))) return TRACE_RETURN (false);
+    if (unlikely (!u.tag.sanitize (c))) return_trace (false);
     switch (u.tag) {
     case CFFTag:        /* All the non-collection tags */
     case TrueTag:
     case Typ1Tag:
-    case TrueTypeTag:   return TRACE_RETURN (u.fontFace.sanitize (c));
-    case TTCTag:        return TRACE_RETURN (u.ttcHeader.sanitize (c));
-    default:            return TRACE_RETURN (true);
+    case TrueTypeTag:   return_trace (u.fontFace.sanitize (c));
+    case TTCTag:        return_trace (u.ttcHeader.sanitize (c));
+    default:            return_trace (true);
     }
   }
 
   protected:
   union {
   Tag                   tag;            /* 4-byte identifier. */
   OpenTypeFontFace      fontFace;
   TTCHeader             ttcHeader;
   } u;
   public:
   DEFINE_SIZE_UNION (4, tag);
 };
 
 
 } /* namespace OT */
 
 
 #endif /* HB_OPEN_FILE_PRIVATE_HH */