Roll harfbuzz-ng to 1.0.5

third_party/harfbuzz-ng/src/hb-ot-layout-jstf-table.hh

 /*
  * Copyright © 2013  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 39 matching lines @@
 
 /*
  * JstfPriority -- Justification Priority Table
  */
 
 struct JstfPriority
 {
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (c->check_struct (this) &&
-                         shrinkageEnableGSUB.sanitize (c, this) &&
-                         shrinkageDisableGSUB.sanitize (c, this) &&
-                         shrinkageEnableGPOS.sanitize (c, this) &&
-                         shrinkageDisableGPOS.sanitize (c, this) &&
-                         shrinkageJstfMax.sanitize (c, this) &&
-                         extensionEnableGSUB.sanitize (c, this) &&
-                         extensionDisableGSUB.sanitize (c, this) &&
-                         extensionEnableGPOS.sanitize (c, this) &&
-                         extensionDisableGPOS.sanitize (c, this) &&
-                         extensionJstfMax.sanitize (c, this));
+    return_trace (c->check_struct (this) &&
+                  shrinkageEnableGSUB.sanitize (c, this) &&
+                  shrinkageDisableGSUB.sanitize (c, this) &&
+                  shrinkageEnableGPOS.sanitize (c, this) &&
+                  shrinkageDisableGPOS.sanitize (c, this) &&
+                  shrinkageJstfMax.sanitize (c, this) &&
+                  extensionEnableGSUB.sanitize (c, this) &&
+                  extensionDisableGSUB.sanitize (c, this) &&
+                  extensionEnableGPOS.sanitize (c, this) &&
+                  extensionDisableGPOS.sanitize (c, this) &&
+                  extensionJstfMax.sanitize (c, this));
   }
 
   protected:
   OffsetTo<JstfModList>
                 shrinkageEnableGSUB;    /* Offset to Shrinkage Enable GSUB
                                          * JstfModList table--from beginning of
                                          * JstfPriority table--may be NULL */
   OffsetTo<JstfModList>
                 shrinkageDisableGSUB;   /* Offset to Shrinkage Disable GSUB
                                          * JstfModList table--from beginning of
@@ skipping 39 matching lines @@
 /*
  * JstfLangSys -- Justification Language System Table
  */
 
 struct JstfLangSys : OffsetListOf<JstfPriority>
 {
   inline bool sanitize (hb_sanitize_context_t *c,
                         const Record<JstfLangSys>::sanitize_closure_t * = NULL) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (OffsetListOf<JstfPriority>::sanitize (c));
+    return_trace (OffsetListOf<JstfPriority>::sanitize (c));
   }
 };
 
 
 /*
  * ExtenderGlyphs -- Extender Glyph Table
  */
 
 typedef SortedArrayOf<GlyphID> ExtenderGlyphs;
 
@@ skipping 20 matching lines @@
   inline bool find_lang_sys_index (hb_tag_t tag, unsigned int *index) const
   { return langSys.find_index (tag, index); }
 
   inline bool has_default_lang_sys (void) const { return defaultLangSys != 0; }
   inline const JstfLangSys& get_default_lang_sys (void) const { return this+defaultLangSys; }
 
   inline bool sanitize (hb_sanitize_context_t *c,
                         const Record<JstfScript>::sanitize_closure_t * = NULL) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (extenderGlyphs.sanitize (c, this) &&
-                         defaultLangSys.sanitize (c, this) &&
-                         langSys.sanitize (c, this));
+    return_trace (extenderGlyphs.sanitize (c, this) &&
+                  defaultLangSys.sanitize (c, this) &&
+                  langSys.sanitize (c, this));
   }
 
   protected:
   OffsetTo<ExtenderGlyphs>
                 extenderGlyphs; /* Offset to ExtenderGlyph table--from beginning
                                  * of JstfScript table-may be NULL */
   OffsetTo<JstfLangSys>
                 defaultLangSys; /* Offset to DefaultJstfLangSys table--from
                                  * beginning of JstfScript table--may be Null */
   RecordArrayOf<JstfLangSys>
@@ skipping 21 matching lines @@
                                        hb_tag_t     *script_tags /* OUT */) const
   { return scriptList.get_tags (start_offset, script_count, script_tags); }
   inline const JstfScript& get_script (unsigned int i) const
   { return this+scriptList[i].offset; }
   inline bool find_script_index (hb_tag_t tag, unsigned int *index) const
   { return scriptList.find_index (tag, index); }
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return TRACE_RETURN (version.sanitize (c) && likely (version.major == 1) &&
-                         scriptList.sanitize (c, this));
+    return_trace (version.sanitize (c) &&
+                  likely (version.major == 1) &&
+                  scriptList.sanitize (c, this));
   }
 
   protected:
   FixedVersion  version;        /* Version of the JSTF table--initially set
                                  * to 0x00010000u */
   RecordArrayOf<JstfScript>
                 scriptList;     /* Array of JstfScripts--listed
                                  * alphabetically by ScriptTag */
   public:
   DEFINE_SIZE_ARRAY (6, scriptList);
 };
 
 
 } /* namespace OT */
 
 
 #endif /* HB_OT_LAYOUT_JSTF_TABLE_HH */