Roll HarfBuzz to 1.1.1

third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh

 /*
  * Copyright © 2007,2008,2009  Red Hat, Inc.
  * Copyright © 2010,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 16 matching lines @@
  */
 
 #ifndef HB_OT_LAYOUT_COMMON_PRIVATE_HH
 #define HB_OT_LAYOUT_COMMON_PRIVATE_HH
 
 #include "hb-ot-layout-private.hh"
 #include "hb-open-type-private.hh"
 #include "hb-set-private.hh"
 
 
+#ifndef HB_MAX_NESTING_LEVEL
+#define HB_MAX_NESTING_LEVEL    6
+#endif
+#ifndef HB_MAX_CONTEXT_LENGTH
+#define HB_MAX_CONTEXT_LENGTH   64
+#endif
+
+
 namespace OT {
 
 
 #define TRACE_DISPATCH(this, format) \
         hb_auto_trace_t<context_t::max_debug_depth, typename context_t::return_t> trace \
         (&c->debug_depth, c->get_name (), this, HB_FUNC, \
          "format %d", (int) format);
 
 
 #define NOT_COVERED             ((unsigned int) -1)
-#define MAX_NESTING_LEVEL       6
-#define MAX_CONTEXT_LENGTH      64
 
 
 
 /*
  *
  * OpenType Layout Common Table Formats
  *
  */
 
 
@@ skipping 507 matching lines @@
     IgnoreMarks         = 0x0008u,
     IgnoreFlags         = 0x000Eu,
     UseMarkFilteringSet = 0x0010u,
     Reserved            = 0x00E0u,
     MarkAttachmentType  = 0xFF00u
   };
   public:
   DEFINE_SIZE_STATIC (2);
 };
 
+} /* namespace OT */
+/* This has to be outside the namespace. */
+HB_MARK_AS_FLAG_T (OT::LookupFlag::Flags);
+namespace OT {
+
 struct Lookup
 {
   inline unsigned int get_subtable_count (void) const { return subTable.len; }
 
   template <typename SubTableType>
   inline const SubTableType& get_subtable (unsigned int i) const
   { return this+CastR<OffsetArrayOf<SubTableType> > (subTable)[i]; }
 
   template <typename SubTableType>
   inline const OffsetArrayOf<SubTableType>& get_subtables (void) const
@@ skipping 629 matching lines @@
   USHORT        deltaValue[VAR];        /* Array of compressed data */
   public:
   DEFINE_SIZE_ARRAY (6, deltaValue);
 };
 
 
 } /* namespace OT */
 
 
 #endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */