Roll HarfBuzz to version 3.1.1 (#30354)
Also migrates to the HarfBuzz 3.x font subsetting API
(see https://github.com/flutter/engine/pull/29266)
diff --git a/DEPS b/DEPS
index 217d2f0..78575da 100644
--- a/DEPS
+++ b/DEPS
@@ -114,7 +114,7 @@
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
'src/third_party/harfbuzz':
- Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + '047b946d1d0a159d7ef9691a44a91bd1253aec6b',
+ Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'd40d15e994ed60d32bcfc9ab87004dfb028dfbd6',
'src/third_party/libcxx':
Var('fuchsia_git') + '/third_party/libcxx' + '@' + '7524ef50093a376f334a62a7e5cebf5d238d4c99',
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index 818682b..03b41af 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 3c6fae7f2cca0297d09ee887ea61c56b
+Signature: 1279ff0657232f7ec6a85d8ceb4acae1
UNUSED LICENSES:
@@ -14833,8 +14833,6 @@
FILE: ../../../third_party/harfbuzz/docs/usermanual-what-is-harfbuzz.xml
FILE: ../../../third_party/harfbuzz/docs/version.xml.in
FILE: ../../../third_party/harfbuzz/harfbuzz.doap
-FILE: ../../../third_party/harfbuzz/meson-cc-tests/intel-atomic-primitives-test.c
-FILE: ../../../third_party/harfbuzz/meson-cc-tests/solaris-atomic-operations.c
FILE: ../../../third_party/harfbuzz/meson.build
FILE: ../../../third_party/harfbuzz/perf/fonts/Amiri-Regular.ttf
FILE: ../../../third_party/harfbuzz/perf/fonts/NotoNastaliqUrdu-Regular.ttf
@@ -14855,7 +14853,7 @@
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-joining-list.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-table.cc
+FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.cc
FILE: ../../../third_party/harfbuzz/src/hb-ot-tag-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ucd-table.hh
@@ -14863,17 +14861,12 @@
FILE: ../../../third_party/harfbuzz/src/meson.build
FILE: ../../../third_party/harfbuzz/src/update-unicode-tables.make
FILE: ../../../third_party/harfbuzz/subprojects/cairo.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/expat.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/fontconfig.wrap
FILE: ../../../third_party/harfbuzz/subprojects/freetype2.wrap
FILE: ../../../third_party/harfbuzz/subprojects/glib.wrap
FILE: ../../../third_party/harfbuzz/subprojects/google-benchmark.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/libffi.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/libpng.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/pixman.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/proxy-libintl.wrap
+FILE: ../../../third_party/harfbuzz/subprojects/packagefiles/ragel/meson.build
+FILE: ../../../third_party/harfbuzz/subprojects/ragel.wrap
FILE: ../../../third_party/harfbuzz/subprojects/ttf-parser.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/zlib.wrap
----------------------------------------------------------------------------------------------------
HarfBuzz is licensed under the so-called "Old MIT" license. Details follow.
For parts of HarfBuzz that are licensed under different licenses see individual
@@ -14888,7 +14881,7 @@
Copyright © 2009 Keith Stribley
Copyright © 2009 Martin Hosken and SIL International
Copyright © 2007 Chris Wilson
-Copyright © 2006 Behdad Esfahbod
+Copyright © 2005,2006,2020,2021 Behdad Esfahbod
Copyright © 2005 David Turner
Copyright © 2004,2007,2008,2009,2010 Red Hat, Inc.
Copyright © 1998-2004 David Turner and Werner Lemberg
@@ -14916,66 +14909,6 @@
====================================================================================================
LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/dump-indic-data.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/dump-indic-data.cc
-FILE: ../../../third_party/harfbuzz/src/dump-khmer-data.cc
-FILE: ../../../third_party/harfbuzz/src/dump-myanmar-data.cc
-FILE: ../../../third_party/harfbuzz/src/dump-use-data.cc
-FILE: ../../../third_party/harfbuzz/src/hb-aat-map.hh
-FILE: ../../../third_party/harfbuzz/src/hb-array.hh
-FILE: ../../../third_party/harfbuzz/src/hb-map.cc
-FILE: ../../../third_party/harfbuzz/src/hb-map.h
-FILE: ../../../third_party/harfbuzz/src/hb-map.hh
-FILE: ../../../third_party/harfbuzz/src/hb-meta.hh
-FILE: ../../../third_party/harfbuzz/src/hb-null.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-deprecated.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-face.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-hdmx-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name-language-static.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name-language.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-os2-unicode-ranges.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-khmer.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.hh
-FILE: ../../../third_party/harfbuzz/src/hb-static.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-input.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-input.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset-plan.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-plan.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset.h
-FILE: ../../../third_party/harfbuzz/src/hb-subset.hh
-FILE: ../../../third_party/harfbuzz/src/test-iter.cc
-FILE: ../../../third_party/harfbuzz/src/test-ot-name.cc
-FILE: ../../../third_party/harfbuzz/src/test-unicode-ranges.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2018 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.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/failing-alloc.c
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/failing-alloc.c
@@ -15222,6 +15155,62 @@
====================================================================================================
LIBRARY: harfbuzz
+ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-map.hh
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/harfbuzz/src/hb-aat-map.hh
+FILE: ../../../third_party/harfbuzz/src/hb-array.hh
+FILE: ../../../third_party/harfbuzz/src/hb-map.cc
+FILE: ../../../third_party/harfbuzz/src/hb-map.h
+FILE: ../../../third_party/harfbuzz/src/hb-map.hh
+FILE: ../../../third_party/harfbuzz/src/hb-meta.hh
+FILE: ../../../third_party/harfbuzz/src/hb-null.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-deprecated.h
+FILE: ../../../third_party/harfbuzz/src/hb-ot-face.cc
+FILE: ../../../third_party/harfbuzz/src/hb-ot-hdmx-table.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-name-language-static.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-name-language.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-name.cc
+FILE: ../../../third_party/harfbuzz/src/hb-ot-os2-unicode-ranges.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-khmer.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.hh
+FILE: ../../../third_party/harfbuzz/src/hb-static.cc
+FILE: ../../../third_party/harfbuzz/src/hb-subset-input.cc
+FILE: ../../../third_party/harfbuzz/src/hb-subset-input.hh
+FILE: ../../../third_party/harfbuzz/src/hb-subset-plan.cc
+FILE: ../../../third_party/harfbuzz/src/hb-subset-plan.hh
+FILE: ../../../third_party/harfbuzz/src/hb-subset.cc
+FILE: ../../../third_party/harfbuzz/src/hb-subset.h
+FILE: ../../../third_party/harfbuzz/src/hb-subset.hh
+FILE: ../../../third_party/harfbuzz/src/test-iter.cc
+FILE: ../../../third_party/harfbuzz/src/test-ot-name.cc
+FILE: ../../../third_party/harfbuzz/src/test-unicode-ranges.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2018 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.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/hb-algs.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-algs.hh
@@ -15314,6 +15303,39 @@
====================================================================================================
LIBRARY: harfbuzz
+ORIGIN: ../../../third_party/harfbuzz/src/hb-bit-page.hh
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/harfbuzz/src/hb-bit-page.hh
+FILE: ../../../third_party/harfbuzz/src/hb-bit-set-invertible.hh
+FILE: ../../../third_party/harfbuzz/src/hb-bit-set.hh
+FILE: ../../../third_party/harfbuzz/src/hb-set.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2012,2017 Google, Inc.
+Copyright © 2021 Behdad Esfahbod
+
+ 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.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/hb-blob.cc
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-blob.cc
@@ -15687,7 +15709,6 @@
FILE: ../../../third_party/harfbuzz/src/hb-config.hh
FILE: ../../../third_party/harfbuzz/src/hb-pool.hh
FILE: ../../../third_party/harfbuzz/src/test-algs.cc
-FILE: ../../../third_party/harfbuzz/src/test-meta.cc
----------------------------------------------------------------------------------------------------
Copyright © 2019 Facebook, Inc.
@@ -16209,6 +16230,37 @@
====================================================================================================
LIBRARY: harfbuzz
+ORIGIN: ../../../third_party/harfbuzz/src/hb-ms-feature-ranges.cc
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/harfbuzz/src/hb-ms-feature-ranges.cc
+FILE: ../../../third_party/harfbuzz/src/hb-ms-feature-ranges.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2012,2013 Google, Inc.
+Copyright © 2021 Khaled Hosny
+
+ 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.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/hb-open-file.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-open-file.hh
@@ -16364,6 +16416,7 @@
ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-color-colr-table.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-color-colr-table.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-color-colrv1-closure.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-color-sbix-table.hh
----------------------------------------------------------------------------------------------------
Copyright © 2018 Ebrahim Byagowi
@@ -17010,6 +17063,36 @@
====================================================================================================
LIBRARY: harfbuzz
+ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-post-table-v2subset.hh
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/harfbuzz/src/hb-ot-post-table-v2subset.hh
+FILE: ../../../third_party/harfbuzz/src/hb-ot-var-common.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2021 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.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic.cc
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic.cc
@@ -17048,7 +17131,6 @@
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-machine.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-machine.rl
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use.hh
----------------------------------------------------------------------------------------------------
Copyright © 2015 Mozilla Foundation.
Copyright © 2015 Google, Inc.
@@ -17106,6 +17188,36 @@
====================================================================================================
LIBRARY: harfbuzz
+ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-syllabic.cc
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-syllabic.cc
+FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-syllabic.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2021 Behdad Esfahbod.
+
+ 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.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex.hh
@@ -17253,13 +17365,15 @@
====================================================================================================
LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-serialize.hh
+ORIGIN: ../../../third_party/harfbuzz/src/hb-priority-queue.hh
TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-serialize.hh
+FILE: ../../../third_party/harfbuzz/src/hb-priority-queue.hh
+FILE: ../../../third_party/harfbuzz/src/hb-repacker.hh
+FILE: ../../../third_party/harfbuzz/src/test-array.cc
+FILE: ../../../third_party/harfbuzz/src/test-priority-queue.cc
+FILE: ../../../third_party/harfbuzz/src/test-repacker.cc
----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009,2010 Red Hat, Inc.
-Copyright © 2012,2018 Google, Inc.
-Copyright © 2019 Facebook, Inc.
+Copyright © 2020 Google, Inc.
This is part of HarfBuzz, a text shaping library.
@@ -17284,11 +17398,13 @@
====================================================================================================
LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-set.hh
+ORIGIN: ../../../third_party/harfbuzz/src/hb-serialize.hh
TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-set.hh
+FILE: ../../../third_party/harfbuzz/src/hb-serialize.hh
----------------------------------------------------------------------------------------------------
-Copyright © 2012,2017 Google, Inc.
+Copyright © 2007,2008,2009,2010 Red Hat, Inc.
+Copyright © 2012,2018 Google, Inc.
+Copyright © 2019 Facebook, Inc.
This is part of HarfBuzz, a text shaping library.
@@ -17515,35 +17631,6 @@
====================================================================================================
LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/test-array.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/test-array.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2020 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.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
ORIGIN: ../../../third_party/harfbuzz/src/test-buffer-serialize.cc
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/test-buffer-serialize.cc
@@ -17603,6 +17690,37 @@
====================================================================================================
====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../third_party/harfbuzz/src/test-map.cc
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/harfbuzz/src/test-map.cc
+FILE: ../../../third_party/harfbuzz/src/test-set.cc
+FILE: ../../../third_party/harfbuzz/src/test-vector.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2021 Behdad Esfahbod
+
+ 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.
+====================================================================================================
+
+====================================================================================================
LIBRARY: icu
ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
TYPE: LicenseType.bsd
@@ -25546,4 +25664,4 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
-Total license count: 403
+Total license count: 407
diff --git a/third_party/txt/tests/paragraph_unittests.cc b/third_party/txt/tests/paragraph_unittests.cc
index 570ea3c..979c007 100644
--- a/third_party/txt/tests/paragraph_unittests.cc
+++ b/third_party/txt/tests/paragraph_unittests.cc
@@ -5592,9 +5592,9 @@
EXPECT_DOUBLE_EQ(paragraph->records_[0].offset().x(), 0);
EXPECT_DOUBLE_EQ(paragraph->records_[1].offset().x(), 0);
- EXPECT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 207.359375f);
- EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 230.859375f);
- EXPECT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 253.34765625f);
+ EXPECT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 207.3671875f);
+ EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 230.8671875f);
+ EXPECT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 253.35546875f);
}
TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(NewlineParagraph)) {
diff --git a/tools/font-subset/fixtures/1.ttf b/tools/font-subset/fixtures/1.ttf
index 5bf1856..70212a7 100644
--- a/tools/font-subset/fixtures/1.ttf
+++ b/tools/font-subset/fixtures/1.ttf
Binary files differ
diff --git a/tools/font-subset/fixtures/2.ttf b/tools/font-subset/fixtures/2.ttf
index 4bb2c2c..21a4692 100644
--- a/tools/font-subset/fixtures/2.ttf
+++ b/tools/font-subset/fixtures/2.ttf
Binary files differ
diff --git a/tools/font-subset/fixtures/3.ttf b/tools/font-subset/fixtures/3.ttf
index 3518145..928bead 100644
--- a/tools/font-subset/fixtures/3.ttf
+++ b/tools/font-subset/fixtures/3.ttf
Binary files differ
diff --git a/tools/font-subset/main.cc b/tools/font-subset/main.cc
index 0bce04d..fc53ef4 100644
--- a/tools/font-subset/main.cc
+++ b/tools/font-subset/main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <hb-subset.h>
+
#include <cstdlib>
#include <fstream>
#include <iostream>
@@ -58,27 +59,17 @@
// The prior version of harfbuzz automatically dropped layout tables,
// but in the new version they are kept by default. So re-add them to the
// drop list to retain the same behaviour.
- hb_set_add(hb_subset_input_drop_tables_set(input),
+
+ hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
HB_TAG('G', 'S', 'U', 'B'));
- hb_set_add(hb_subset_input_drop_tables_set(input),
+ hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
HB_TAG('G', 'P', 'O', 'S'));
- hb_set_add(hb_subset_input_drop_tables_set(input),
+ hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
HB_TAG('G', 'D', 'E', 'F'));
return HarfbuzzWrappers::HbFacePtr(hb_subset_or_fail(face, input));
}
};
-template <typename T>
-struct HarfBuzzSubset<T,
- void_t<decltype(hb_subset(std::declval<hb_face_t*>(),
- std::declval<T>()))>> {
- // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
- // This code should be removed as soon as all users are migrated to the newer
- // API.
- static HarfbuzzWrappers::HbFacePtr Make(hb_face_t* face, T input) {
- return HarfbuzzWrappers::HbFacePtr(hb_subset(face, input));
- }
-};
int main(int argc, char** argv) {
if (argc != 3) {
