8247872: Upgrade HarfBuzz to the latest 2.7.2

openjdk · Nov 2, 2020 · 8d1ea46 · 8d1ea46
1 parent d086757
commit 8d1ea46
Show file tree

Hide file tree

Showing 205 changed files with 31,880 additions and 19,411 deletions.
diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -435,7 +435,6 @@ endif
 ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
   LIBHARFBUZZ_LIBS := $(HARFBUZZ_LIBS)
 else
-  HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
 
   # This is better than adding EXPORT_ALL_SYMBOLS
   ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )

diff --git a/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md
@@ -1,16 +1,18 @@
-## Harfbuzz v2.3.1
+## Harfbuzz v2.7.2
 
 ### Harfbuzz License
 
-http://cgit.freedesktop.org/harfbuzz/tree/COPYING
+https://github.com/harfbuzz/harfbuzz/blob/master/COPYING
 
 <pre>
 
-HarfBuzz is licensed under the so-called "Old MIT" license. Details follow.
+HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
 files names COPYING in subdirectories where applicable.
 
-Copyright © 2010,2011,2012  Google, Inc.
+Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020  Google, Inc.
+Copyright © 2018,2019,2020  Ebrahim Byagowi
+Copyright © 2019,2020  Facebook, Inc. 
 Copyright © 2012  Mozilla Foundation
 Copyright © 2011  Codethink Limited
 Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)

diff --git a/src/java.desktop/share/native/libharfbuzz/abc.txt b/src/java.desktop/share/native/libharfbuzz/abc.txt
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-fdsc-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-fdsc-table.hh
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh
@@ -66,7 +66,7 @@ struct ankr
   {
     const NNOffsetTo<GlyphAnchors> *offset = (this+lookupTable).get_value (glyph_id, num_glyphs);
     if (!offset)
-      return Null(Anchor);
+      return Null (Anchor);
     const GlyphAnchors &anchors = &(this+anchorData) + *offset;
     return anchors[i];
   }
@@ -76,13 +76,14 @@ struct ankr
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
                           version == 0 &&
+                          c->check_range (this, anchorData) &&
                           lookupTable.sanitize (c, this, &(this+anchorData))));
   }
 
   protected:
   HBUINT16      version;        /* Version number (set to zero) */
   HBUINT16      flags;          /* Flags (currently unused; set to zero) */
-  LOffsetTo<Lookup<NNOffsetTo<GlyphAnchors> > >
+  LOffsetTo<Lookup<NNOffsetTo<GlyphAnchors>>>
                 lookupTable;    /* Offset to the table's lookup table */
   LNNOffsetTo<HBUINT8>
                 anchorData;     /* Offset to the glyph data table */

diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh
@@ -82,7 +82,7 @@ struct BaselineTableFormat2Part
   }
 
   protected:
-  GlyphID       stdGlyph;       /* The specific glyph index number in this
+  HBGlyphID     stdGlyph;       /* The specific glyph index number in this
                                  * font that is used to set the baseline values.
                                  * This is the standard glyph.
                                  * This glyph must contain a set of control points
@@ -101,11 +101,11 @@ struct BaselineTableFormat3Part
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && lookupTable.sanitize (c));
+    return_trace (likely (c->check_struct (this) && lookupTable.sanitize (c)));
   }
 
   protected:
-  GlyphID       stdGlyph;       /* ditto */
+  HBGlyphID     stdGlyph;       /* ditto */
   HBUINT16      ctlPoints[32];  /* ditto */
   Lookup<HBUINT16>
                 lookupTable;    /* Lookup table that maps glyphs to their