roll harfbuzz 0d2c2f238bf0a847ecd55a70cc0f081f18a053ac:d457e3f0ff9b27616a34e4cc110d3edbf8796841

BUG=406957
R=behdad@google.com
TBR=behdad@chromium.org

Review URL: https://codereview.chromium.org/503073002

Cr-Commit-Position: refs/heads/master@{#291707}

third_party/harfbuzz-ng/README.chromium

 Name: harfbuzz-ng
 Short Name: harfbuzz-ng
 URL: http://harfbuzz.org
-Version: 0d2c2f238bf0a847ecd55a70cc0f081f18a053ac
+Version: d457e3f0ff9b27616a34e4cc110d3edbf8796841
 Date: 20140813
 Security Critical: yes
 License: MIT
@@ -13,10 +13,9 @@ API from the old one.
 
 This copy of harfbuzz is usually updated by downloading the release tarball
 from http://www.freedesktop.org/software/harfbuzz/release/ , removing
-files in src, copying *.h *.hh *.cc from the tarball's src folder
-over to src, apply google.patch, then checking for removed or added
-files and update our build recipes in BUILD.gn and harfbuzz.gyp
-accordingly.
+files in src, copying *.h *.hh *.cc from the tarball's src folder over to src,
+then checking for removed or added files and update our build recipes in
+BUILD.gn and harfbuzz.gyp accordingly.
 
-Right now, it uses revision 0d2c2f238bf0a847ecd55a70cc0f081f18a053ac from
+Right now, it uses revision d457e3f0ff9b27616a34e4cc110d3edbf8796841 from
 https://github.com/behdad/harfbuzz

third_party/harfbuzz-ng/google.patch

-diff --git a/third_party/harfbuzz-ng/src/hb-private.hh b/third_party/harfbuzz-ng/src/hb-private.hh
-index 6b9d791..8f68e8b 100644
---- a/third_party/harfbuzz-ng/src/hb-private.hh
-+++ b/third_party/harfbuzz-ng/src/hb-private.hh
-@@ -131,7 +131,9 @@
- #  ifndef WIN32_LEAN_AND_MEAN
- #    define WIN32_LEAN_AND_MEAN
- #  endif
--#  define STRICT
-+#  ifndef STRICT
-+#    define STRICT
-+#  endif
- #endif
- 
- #ifdef _WIN32_WCE

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

@@ -327,7 +327,7 @@ struct range_record_t {
 #define kUpperCaseType				38
 
 /* Table data courtesy of Apple. */
-struct feature_mapping_t {
+static const struct feature_mapping_t {
     FourCharCode otFeatureTag;
     uint16_t aatFeatureType;
     uint16_t selectorToEnable;

third_party/harfbuzz-ng/src/hb-ot-font.cc

@@ -81,12 +81,15 @@ _hb_ot_font_create (hb_font_t *font)
   const OT::CmapSubtable *subtable_uvs = NULL;
 
   /* 32-bit subtables. */
+  if (!subtable) subtable = cmap->find_subtable (3, 10);
   if (!subtable) subtable = cmap->find_subtable (0, 6);
   if (!subtable) subtable = cmap->find_subtable (0, 4);
-  if (!subtable) subtable = cmap->find_subtable (3, 10);
   /* 16-bit subtables. */
-  if (!subtable) subtable = cmap->find_subtable (0, 3);
   if (!subtable) subtable = cmap->find_subtable (3, 1);
+  if (!subtable) subtable = cmap->find_subtable (0, 3);
+  if (!subtable) subtable = cmap->find_subtable (0, 2);
+  if (!subtable) subtable = cmap->find_subtable (0, 1);
+  if (!subtable) subtable = cmap->find_subtable (0, 0);
   /* Meh. */
   if (!subtable) subtable = &OT::Null(OT::CmapSubtable);
 

third_party/harfbuzz-ng/src/hb-ot-shape-complex-arabic-fallback.hh

@@ -207,7 +207,7 @@ struct arabic_fallback_plan_t
 
 static const arabic_fallback_plan_t arabic_fallback_plan_nil = {};
 
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(HB_WITH_WIN1256)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(HB_NO_WIN1256)
 #define HB_WITH_WIN1256
 #endif
 

third_party/harfbuzz-ng/src/hb-ot-shape-complex-arabic-win1256.hh

@@ -314,7 +314,7 @@ OT_TABLE_END
  * Include a second time to get the table data...
  */
 #ifdef OT_MEASURE
-#include __FILE__
+#include "hb-ot-shape-complex-arabic-win1256.hh"
 #endif
 
 #define HB_OT_SHAPE_COMPLEX_ARABIC_WIN1256_HH

third_party/harfbuzz-ng/src/hb-private.hh

@@ -129,10 +129,10 @@
 #    define _WIN32_WINNT 0x0600
 #  endif
 #  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN 1
 #  endif
 #  ifndef STRICT
-#    define STRICT
+#    define STRICT 1
 #  endif
 #endif