Roll HarfBuzz to 1.4.6

third_party/harfbuzz-ng/src/hb-shape-plan.cc

 /*
  * 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
  * all copies of this software.
@@ skipping 17 matching lines @@
 #include "hb-shaper-private.hh"
 #include "hb-font-private.hh"
 #include "hb-buffer-private.hh"
 
 
 #ifndef HB_DEBUG_SHAPE_PLAN
 #define HB_DEBUG_SHAPE_PLAN (HB_DEBUG+0)
 #endif
 
 
-#define HB_SHAPER_IMPLEMENT(shaper) \
-        HB_SHAPER_DATA_ENSURE_DECLARE(shaper, face) \
-        HB_SHAPER_DATA_ENSURE_DECLARE(shaper, font)
-#include "hb-shaper-list.hh"
-#undef HB_SHAPER_IMPLEMENT
-
-
 static void
 hb_shape_plan_plan (hb_shape_plan_t    *shape_plan,
                     const hb_feature_t *user_features,
                     unsigned int        num_user_features,
                     const int          *coords,
                     unsigned int        num_coords,
                     const char * const *shaper_list)
 {
   DEBUG_MSG_FUNC (SHAPE_PLAN, shape_plan,
                   "num_features=%d num_coords=%d shaper_list=%p",
@@ skipping 376 matching lines @@
          hb_shape_plan_user_features_match (shape_plan, proposal) &&
          hb_shape_plan_coords_match (shape_plan, proposal) &&
          ((shape_plan->default_shaper_list && proposal->shaper_list == NULL) ||
           (shape_plan->shaper_func == proposal->shaper_func));
 }
 
 static inline hb_bool_t
 hb_non_global_user_features_present (const hb_feature_t *user_features,
                                      unsigned int        num_user_features)
 {
-  while (num_user_features)
+  while (num_user_features) {
     if (user_features->start != 0 || user_features->end != (unsigned int) -1)
       return true;
-    else
-      num_user_features--, user_features++;
+    num_user_features--;
+    user_features++;
+  }
   return false;
 }
 
 static inline hb_bool_t
 hb_coords_present (const int *coords,
                    unsigned int num_coords)
 {
   return num_coords != 0;
 }
 
@@ skipping 120 matching lines @@
  *
  * Return value: (transfer none):
  *
  * Since: 0.9.7
  **/
 const char *
 hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan)
 {
   return shape_plan->shaper_name;
 }