Roll harfbuzz-ng to 1.0.5

third_party/harfbuzz-ng/src/hb-ot-name-table.hh

 /*
  * Copyright © 2011,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 42 matching lines @@
     if (ret) return ret;
     ret = b->nameID.cmp (a->nameID);
     if (ret) return ret;
     return 0;
   }
 
   inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
     /* We can check from base all the way up to the end of string... */
-    return TRACE_RETURN (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset));
+    return_trace (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset));
   }
 
   USHORT        platformID;     /* Platform ID. */
   USHORT        encodingID;     /* Platform-specific encoding ID. */
   USHORT        languageID;     /* Language ID. */
   USHORT        nameID;         /* Name ID. */
   USHORT        length;         /* String length (in bytes). */
   USHORT        offset;         /* String offset from start of storage area (in bytes). */
   public:
   DEFINE_SIZE_STATIC (12);
@@ skipping 26 matching lines @@
   }
 
   inline unsigned int get_size (void) const
   { return min_size + count * nameRecord[0].min_size; }
 
   inline bool sanitize_records (hb_sanitize_context_t *c) const {
     TRACE_SANITIZE (this);
     char *string_pool = (char *) this + stringOffset;
     unsigned int _count = count;
     for (unsigned int i = 0; i < _count; i++)
-      if (!nameRecord[i].sanitize (c, string_pool)) return TRACE_RETURN (false);
-    return TRACE_RETURN (true);
+      if (!nameRecord[i].sanitize (c, string_pool)) return_trace (false);
+    return_trace (true);
   }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (c->check_struct (this) &&
-                         likely (format == 0 || format == 1) &&
-                         c->check_array (nameRecord, nameRecord[0].static_size, count) &&
-                         sanitize_records (c));
+    return_trace (c->check_struct (this) &&
+                  likely (format == 0 || format == 1) &&
+                  c->check_array (nameRecord, nameRecord[0].static_size, count) &&
+                  sanitize_records (c));
   }
 
   /* We only implement format 0 for now. */
   USHORT        format;                 /* Format selector (=0/1). */
   USHORT        count;                  /* Number of name records. */
   Offset<>      stringOffset;           /* Offset to start of string storage (from start of table). */
   NameRecord    nameRecord[VAR];        /* The name records where count is the number of records. */
   public:
   DEFINE_SIZE_ARRAY (6, nameRecord);
 };
 
 
 } /* namespace OT */
 
 
 #endif /* HB_OT_NAME_TABLE_HH */