[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-machinery-private.hh        |    6 ------
 src/hb-ot-layout-common-private.hh |    4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 66ccd8ac405c9c25b37de9eb467a7382880dda35
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 30 17:03:06 2018 -0700

    [serialize] Increase stage count from 8 to 32
    
    Indic shaper uses many stages.  Now we are provably not limiting
    functionality whereas the previous limit of 8 was assuming real-world
    practices.

diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index dec237c8..1cf530ea 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -45,8 +45,10 @@
 /*
  * The maximum number of times a lookup can be applied during shaping.
  * Used to limit the number of iterations of the closure algorithm.
+ * This must be larger than the number of times add_pause() is
+ * called in a collect_features call of any shaper.
  */
-#define HB_CLOSURE_MAX_STAGES	8
+#define HB_CLOSURE_MAX_STAGES	32
 #endif
 
 
commit ee8cf919654cb191e955fe1f89b1ebfb2b8b32ee
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 30 16:59:41 2018 -0700

    [serialize] Remove unused truncate() method

diff --git a/src/hb-machinery-private.hh b/src/hb-machinery-private.hh
index 653d7c6f..ff56b1dc 100644
--- a/src/hb-machinery-private.hh
+++ b/src/hb-machinery-private.hh
@@ -467,12 +467,6 @@ struct hb_serialize_context_t
     return reinterpret_cast<Type *> (&obj);
   }
 
-  inline void truncate (void *new_head)
-  {
-    assert (this->start < new_head && new_head <= this->head);
-    this->head = (char *) new_head;
-  }
-
   unsigned int debug_depth;
   char *start, *end, *head;
   bool ran_out_of_room;