--- old/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.hh	2020-07-21 14:26:15.858861093 -0700
+++ /dev/null	2020-01-23 11:31:37.155195123 -0800
@@ -1,134 +0,0 @@
-/*
- * 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.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Google Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_SHAPER_HH
-#define HB_SHAPER_HH
-
-#include "hb.hh"
-#include "hb-machinery.hh"
-
-typedef hb_bool_t hb_shape_func_t (hb_shape_plan_t    *shape_plan,
-                                   hb_font_t          *font,
-                                   hb_buffer_t        *buffer,
-                                   const hb_feature_t *features,
-                                   unsigned int        num_features);
-
-#define HB_SHAPER_IMPLEMENT(name) \
-        extern "C" HB_INTERNAL hb_shape_func_t _hb_##name##_shape;
-#include "hb-shaper-list.hh"
-#undef HB_SHAPER_IMPLEMENT
-
-struct hb_shaper_entry_t {
-  char name[16];
-  hb_shape_func_t *func;
-};
-
-HB_INTERNAL const hb_shaper_entry_t *
-_hb_shapers_get ();
-
-
-template <typename Data, unsigned int WheresData, typename T>
-struct hb_shaper_lazy_loader_t;
-
-#define HB_SHAPER_ORDER(Shaper) \
-  HB_PASTE (HB_SHAPER_ORDER_, Shaper)
-enum hb_shaper_order_t
-{
-  _HB_SHAPER_ORDER_ORDER_ZERO,
-#define HB_SHAPER_IMPLEMENT(Shaper) \
-      HB_SHAPER_ORDER (Shaper),
-#include "hb-shaper-list.hh"
-#undef HB_SHAPER_IMPLEMENT
-  _HB_SHAPERS_COUNT_PLUS_ONE,
-  HB_SHAPERS_COUNT = _HB_SHAPERS_COUNT_PLUS_ONE - 1,
-};
-
-template <enum hb_shaper_order_t order, typename Object> struct hb_shaper_object_data_type_t;
-
-#define HB_SHAPER_DATA_SUCCEEDED ((void *) +1)
-#define HB_SHAPER_DATA_TYPE(shaper, object)             hb_##shaper##_##object##_data_t
-#define HB_SHAPER_DATA_CREATE_FUNC(shaper, object)      _hb_##shaper##_shaper_##object##_data_create
-#define HB_SHAPER_DATA_DESTROY_FUNC(shaper, object)     _hb_##shaper##_shaper_##object##_data_destroy
-
-#define HB_SHAPER_DATA_INSTANTIATE_SHAPERS(shaper, object) \
-        \
-        struct HB_SHAPER_DATA_TYPE (shaper, object); /* Type forward declaration. */ \
-        extern "C" HB_INTERNAL HB_SHAPER_DATA_TYPE (shaper, object) * \
-        HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (hb_##object##_t *object); \
-        extern "C" HB_INTERNAL void \
-        HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA_TYPE (shaper, object) *shaper##_##object); \
-        \
-        template <> \
-        struct hb_shaper_object_data_type_t<HB_SHAPER_ORDER (shaper), hb_##object##_t> \
-        { \
-          typedef HB_SHAPER_DATA_TYPE(shaper, object) value; \
-        }; \
-        \
-        template <unsigned int WheresData> \
-        struct hb_shaper_lazy_loader_t<hb_##object##_t, WheresData, HB_SHAPER_DATA_TYPE(shaper, object)> \
-                : hb_lazy_loader_t<HB_SHAPER_DATA_TYPE(shaper, object), \
-                                   hb_shaper_lazy_loader_t<hb_##object##_t, \
-                                                           WheresData, \
-                                                           HB_SHAPER_DATA_TYPE(shaper, object)>, \
-                                   hb_##object##_t, WheresData> \
-        { \
-          typedef HB_SHAPER_DATA_TYPE(shaper, object) Type; \
-          static Type* create (hb_##object##_t *data) \
-          { return HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (data); } \
-          static Type *get_null () { return nullptr; } \
-          static void destroy (Type *p) { HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (p); } \
-        }; \
-        \
-        static_assert (true, "") /* Require semicolon. */
-
-
-template <typename Object>
-struct hb_shaper_object_dataset_t
-{
-  void init0 (Object *parent_data)
-  {
-    this->parent_data = parent_data;
-#define HB_SHAPER_IMPLEMENT(shaper) shaper.init0 ();
-#include "hb-shaper-list.hh"
-#undef HB_SHAPER_IMPLEMENT
-  }
-  void fini ()
-  {
-#define HB_SHAPER_IMPLEMENT(shaper) shaper.fini ();
-#include "hb-shaper-list.hh"
-#undef HB_SHAPER_IMPLEMENT
-  }
-
-  Object *parent_data; /* MUST be JUST before the lazy loaders. */
-#define HB_SHAPER_IMPLEMENT(shaper) \
-        hb_shaper_lazy_loader_t<Object, HB_SHAPER_ORDER(shaper), \
-                                typename hb_shaper_object_data_type_t<HB_SHAPER_ORDER(shaper), Object>::value \
-                               > shaper;
-#include "hb-shaper-list.hh"
-#undef HB_SHAPER_IMPLEMENT
-};
-
-#endif /* HB_SHAPER_HH */
--- /dev/null	2020-01-23 11:31:37.155195123 -0800
+++ new/src/java.desktop/share/native/libharfbuzz/hb-shaper.hh	2020-07-21 14:26:15.546861098 -0700
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_SHAPER_HH
+#define HB_SHAPER_HH
+
+#include "hb.hh"
+#include "hb-machinery.hh"
+
+typedef hb_bool_t hb_shape_func_t (hb_shape_plan_t    *shape_plan,
+                                   hb_font_t          *font,
+                                   hb_buffer_t        *buffer,
+                                   const hb_feature_t *features,
+                                   unsigned int        num_features);
+
+#define HB_SHAPER_IMPLEMENT(name) \
+        extern "C" HB_INTERNAL hb_shape_func_t _hb_##name##_shape;
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+
+struct hb_shaper_entry_t {
+  char name[16];
+  hb_shape_func_t *func;
+};
+
+HB_INTERNAL const hb_shaper_entry_t *
+_hb_shapers_get ();
+
+
+template <typename Data, unsigned int WheresData, typename T>
+struct hb_shaper_lazy_loader_t;
+
+#define HB_SHAPER_ORDER(Shaper) \
+  HB_PASTE (HB_SHAPER_ORDER_, Shaper)
+enum hb_shaper_order_t
+{
+  _HB_SHAPER_ORDER_ORDER_ZERO,
+#define HB_SHAPER_IMPLEMENT(Shaper) \
+      HB_SHAPER_ORDER (Shaper),
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+  _HB_SHAPERS_COUNT_PLUS_ONE,
+  HB_SHAPERS_COUNT = _HB_SHAPERS_COUNT_PLUS_ONE - 1,
+};
+
+template <enum hb_shaper_order_t order, typename Object> struct hb_shaper_object_data_type_t;
+
+#define HB_SHAPER_DATA_SUCCEEDED ((void *) +1)
+#define HB_SHAPER_DATA_TYPE(shaper, object)             hb_##shaper##_##object##_data_t
+#define HB_SHAPER_DATA_CREATE_FUNC(shaper, object)      _hb_##shaper##_shaper_##object##_data_create
+#define HB_SHAPER_DATA_DESTROY_FUNC(shaper, object)     _hb_##shaper##_shaper_##object##_data_destroy
+
+#define HB_SHAPER_DATA_INSTANTIATE_SHAPERS(shaper, object) \
+        \
+        struct HB_SHAPER_DATA_TYPE (shaper, object); /* Type forward declaration. */ \
+        extern "C" HB_INTERNAL HB_SHAPER_DATA_TYPE (shaper, object) * \
+        HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (hb_##object##_t *object); \
+        extern "C" HB_INTERNAL void \
+        HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA_TYPE (shaper, object) *shaper##_##object); \
+        \
+        template <> \
+        struct hb_shaper_object_data_type_t<HB_SHAPER_ORDER (shaper), hb_##object##_t> \
+        { \
+          typedef HB_SHAPER_DATA_TYPE(shaper, object) value; \
+        }; \
+        \
+        template <unsigned int WheresData> \
+        struct hb_shaper_lazy_loader_t<hb_##object##_t, WheresData, HB_SHAPER_DATA_TYPE(shaper, object)> \
+                : hb_lazy_loader_t<HB_SHAPER_DATA_TYPE(shaper, object), \
+                                   hb_shaper_lazy_loader_t<hb_##object##_t, \
+                                                           WheresData, \
+                                                           HB_SHAPER_DATA_TYPE(shaper, object)>, \
+                                   hb_##object##_t, WheresData> \
+        { \
+          typedef HB_SHAPER_DATA_TYPE(shaper, object) Type; \
+          static Type* create (hb_##object##_t *data) \
+          { return HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (data); } \
+          static Type *get_null () { return nullptr; } \
+          static void destroy (Type *p) { HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (p); } \
+        }; \
+        \
+        static_assert (true, "") /* Require semicolon. */
+
+
+template <typename Object>
+struct hb_shaper_object_dataset_t
+{
+  void init0 (Object *parent_data)
+  {
+    this->parent_data = parent_data;
+#define HB_SHAPER_IMPLEMENT(shaper) shaper.init0 ();
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+  }
+  void fini ()
+  {
+#define HB_SHAPER_IMPLEMENT(shaper) shaper.fini ();
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+  }
+
+  Object *parent_data; /* MUST be JUST before the lazy loaders. */
+#define HB_SHAPER_IMPLEMENT(shaper) \
+        hb_shaper_lazy_loader_t<Object, HB_SHAPER_ORDER(shaper), \
+                                typename hb_shaper_object_data_type_t<HB_SHAPER_ORDER(shaper), Object>::value \
+                               > shaper;
+#include "hb-shaper-list.hh"
+#undef HB_SHAPER_IMPLEMENT
+};
+
+#endif /* HB_SHAPER_HH */