Roll HarfBuzz to 0.9.32

third_party/harfbuzz-ng/src/hb-coretext.cc

 /*
  * Copyright © 2012,2013  Mozilla Foundation.
  * Copyright © 2012,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
@@ skipping 459 matching lines @@
       event->start = true;
       event->feature = feature;
 
       event = feature_events.push ();
       if (unlikely (!event))
         goto fail_features;
       event->index = features[i].end;
       event->start = false;
       event->feature = feature;
     }
-    feature_events.sort ();
+    feature_events.qsort ();
     /* Add a strategic final event. */
     {
       active_feature_t feature;
       feature.rec.feature = HB_TAG_NONE;
       feature.rec.setting = 0;
       feature.order = num_features + 1;
 
       feature_event_t *event = feature_events.push ();
       if (unlikely (!event))
         goto fail_features;
       event->index = 0; /* This value does magic. */
       event->start = false;
       event->feature = feature;
     }
 
     /* Scan events and save features for each range. */
     hb_auto_array_t<active_feature_t> active_features;
     unsigned int last_index = 0;
     for (unsigned int i = 0; i < feature_events.len; i++)
     {
       feature_event_t *event = &feature_events[i];
 
       if (event->index != last_index)
       {
         /* Save a snapshot of active features and the range. */
         range_record_t *range = range_records.push ();
         if (unlikely (!range))
           goto fail_features;
 
-        unsigned int offset = feature_records.len;
-
         if (active_features.len)
         {
           CFMutableArrayRef features_array = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
 
           /* TODO sort and resolve conflicting features? */
-          /* active_features.sort (); */
+          /* active_features.qsort (); */
           for (unsigned int j = 0; j < active_features.len; j++)
           {
             CFStringRef keys[2] = {
               kCTFontFeatureTypeIdentifierKey,
               kCTFontFeatureSelectorIdentifierKey
             };
             CFNumberRef values[2] = {
               CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.feature),
               CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.setting)
             };
@@ skipping 77 matching lines @@
   }
 
 #define utf16_index() var1.u32
 
   ALLOCATE_ARRAY (UniChar, pchars, buffer->len * 2);
 
   unsigned int chars_len = 0;
   for (unsigned int i = 0; i < buffer->len; i++) {
     hb_codepoint_t c = buffer->info[i].codepoint;
     buffer->info[i].utf16_index() = chars_len;
-    if (likely (c < 0x10000))
+    if (likely (c <= 0xFFFFu))
       pchars[chars_len++] = c;
-    else if (unlikely (c >= 0x110000))
-      pchars[chars_len++] = 0xFFFD;
+    else if (unlikely (c > 0x10FFFFu))
+      pchars[chars_len++] = 0xFFFDu;
     else {
-      pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10);
-      pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1));
+      pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10);
+      pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1 << 10) - 1));
     }
   }
 
 #undef utf16_index
 
   CFStringRef string_ref = CFStringCreateWithCharactersNoCopy (NULL,
                                                                pchars, chars_len,
                                                                kCFAllocatorNull);
 
   CFMutableAttributedStringRef attr_string = CFAttributedStringCreateMutable (NULL, chars_len);
   CFAttributedStringReplaceString (attr_string, CFRangeMake (0, 0), string_ref);
   CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len),
                                   kCTFontAttributeName, font_data->ct_font);
 
   if (num_features)
   {
     ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len);
 
     /* Need log_clusters to assign features. */
     chars_len = 0;
     for (unsigned int i = 0; i < buffer->len; i++)
     {
       hb_codepoint_t c = buffer->info[i].codepoint;
       unsigned int cluster = buffer->info[i].cluster;
       log_clusters[chars_len++] = cluster;
-      if (c >= 0x10000 && c < 0x110000)
+      if (hb_in_range (c, 0x10000u, 0x10FFFFu))
         log_clusters[chars_len++] = cluster; /* Surrogates. */
     }
 
     unsigned int start = 0;
     range_record_t *last_range = &range_records[0];
     for (unsigned int k = 0; k < chars_len; k++)
     {
       range_record_t *range = last_range;
       while (log_clusters[k] < range->index_first)
         range--;
@@ skipping 51 matching lines @@
         if (buffer->in_error)
           FAIL ("Buffer resize failed");
         hb_glyph_info_t *info = buffer->info + buffer->len;
 
         CGGlyph notdef = 0;
         double advance = CTFontGetAdvancesForGlyphs (font_data->ct_font, kCTFontHorizontalOrientation, &notdef, NULL, 1);
 
         for (CFIndex j = range.location; j < range.location + range.length; j++)
         {
             UniChar ch = CFStringGetCharacterAtIndex (string_ref, j);
-            if (hb_in_range<UniChar> (ch, 0xDC00, 0xDFFF) && range.location < j)
+            if (hb_in_range<UniChar> (ch, 0xDC00u, 0xDFFFu) && range.location < j)
             {
               ch = CFStringGetCharacterAtIndex (string_ref, j - 1);
-              if (hb_in_range<UniChar> (ch, 0xD800, 0xDBFF))
+              if (hb_in_range<UniChar> (ch, 0xD800u, 0xDBFFu))
                 /* This is the second of a surrogate pair.  Don't need .notdef
                  * for this one. */
                 continue;
             }
 
             info->codepoint = notdef;
             /* TODO We have to fixup clusters later.  See vis_clusters in
              * hb-uniscribe.cc for example. */
             info->cluster = j;
 
@@ skipping 203 matching lines @@
 
 hb_bool_t
 _hb_coretext_aat_shape (hb_shape_plan_t    *shape_plan,
                         hb_font_t          *font,
                         hb_buffer_t        *buffer,
                         const hb_feature_t *features,
                         unsigned int        num_features)
 {
   return _hb_coretext_shape (shape_plan, font, buffer, features, num_features);
 }