Skip to content

Commit

Permalink
Update harfbuzz to 2.6.2, Roll buildroot to a518e (flutter#13242)
Browse files Browse the repository at this point in the history
  • Loading branch information
GaryQian authored Oct 22, 2019
1 parent d7ca3c7 commit 5061b61
Show file tree
Hide file tree
Showing 4 changed files with 181 additions and 14 deletions.
5 changes: 5 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ group("flutter") {

config("config") {
include_dirs = [ ".." ]
if (is_win) {
if (current_cpu != "x86") {
cflags = [ "/WX" ] # Treat warnings as errors.
}
}
}

config("export_dynamic_symbols") {
Expand Down
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '994c6c0648b8eb4a4ff8123c5512b7ad4057c5cd',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a518e359c41e00f964f7cc079cbc5ef525f82516',

# Fuchsia compatibility
#
Expand All @@ -158,7 +158,7 @@ deps = {
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '32d07c55db1bb6c2ae17cba4033491a667647753',

'src/third_party/harfbuzz':
Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + '2f8d51731d6502765aec2f93143c57bf13234358',
Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + 'f5c000538699a4e40649508a44f41d37035e6c35',

'src/third_party/libcxx':
Var('fuchsia_git') + '/third_party/libcxx' + '@' + '7524ef50093a376f334a62a7e5cebf5d238d4c99',
Expand Down
178 changes: 170 additions & 8 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: bc14a6c15e2ed1c6819d722a808248b9
Signature: cbd43a0be5a032d016a584dc0fa51225

UNUSED LICENSES:

Expand Down Expand Up @@ -11568,6 +11568,7 @@ FILE: ../../../third_party/harfbuzz/src/harfbuzz-config.cmake.in
FILE: ../../../third_party/harfbuzz/src/harfbuzz-gobject.pc.in
FILE: ../../../third_party/harfbuzz/src/harfbuzz-icu.pc.in
FILE: ../../../third_party/harfbuzz/src/harfbuzz-subset.pc.in
FILE: ../../../third_party/harfbuzz/src/harfbuzz.cc
FILE: ../../../third_party/harfbuzz/src/harfbuzz.pc.in
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
Expand Down Expand Up @@ -11692,6 +11693,8 @@ FILE: ../../../third_party/harfbuzz/src/hb-ot-color-colr-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-color-sbix-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-color-svg-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-gasp-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-metrics.h
FILE: ../../../third_party/harfbuzz/src/hb-ot-metrics.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-stat-table.hh
----------------------------------------------------------------------------------------------------
Copyright © 2018 Ebrahim Byagowi
Expand Down Expand Up @@ -11790,6 +11793,46 @@ 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-aat-layout-opbd-table.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-opbd-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-gdi.cc
FILE: ../../../third_party/harfbuzz/src/hb-gdi.h
FILE: ../../../third_party/harfbuzz/src/hb-number-parser.hh
FILE: ../../../third_party/harfbuzz/src/hb-number-parser.rl
FILE: ../../../third_party/harfbuzz/src/hb-number.cc
FILE: ../../../third_party/harfbuzz/src/hb-number.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-meta-table.hh
FILE: ../../../third_party/harfbuzz/src/hb-ot-meta.cc
FILE: ../../../third_party/harfbuzz/src/hb-ot-meta.h
FILE: ../../../third_party/harfbuzz/src/test-number.cc
FILE: ../../../third_party/harfbuzz/src/test-ot-meta.cc
----------------------------------------------------------------------------------------------------
Copyright © 2019 Ebrahim Byagowi

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-aat-layout.cc
Expand Down Expand Up @@ -11914,6 +11957,35 @@ 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-bimap.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-bimap.hh
----------------------------------------------------------------------------------------------------
Copyright © 2019 Adobe 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-blob.cc
Expand Down Expand Up @@ -13005,6 +13077,8 @@ TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-glyf-table.hh
----------------------------------------------------------------------------------------------------
Copyright © 2015 Google, Inc.
Copyright © 2019 Adobe Inc.
Copyright © 2019 Ebrahim Byagowi

This is part of HarfBuzz, a text shaping library.

Expand Down Expand Up @@ -13105,9 +13179,9 @@ ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout-base-table.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-base-table.hh
----------------------------------------------------------------------------------------------------
Copyright © 2016 Elie Roux <[email protected]>
Copyright © 2016 Elie Roux <[email protected]>
Copyright © 2018 Google, Inc.
Copyright © 2018 Ebrahim Byagowi
Copyright © 2018-2019 Ebrahim Byagowi

This is part of HarfBuzz, a text shaping library.

Expand Down Expand Up @@ -13374,6 +13448,35 @@ 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-metrics.cc
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-metrics.cc
----------------------------------------------------------------------------------------------------
Copyright © 2018-2019 Ebrahim Byagowi

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-name.h
Expand Down Expand Up @@ -13646,6 +13749,36 @@ 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-var-gvar-table.hh
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/hb-ot-var-gvar-table.hh
----------------------------------------------------------------------------------------------------
Copyright © 2019 Adobe Inc.
Copyright © 2019 Ebrahim Byagowi

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-serialize.hh
Expand Down Expand Up @@ -13877,6 +14010,35 @@ 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-bimap.cc
TYPE: LicenseType.unknown
FILE: ../../../third_party/harfbuzz/src/test-bimap.cc
----------------------------------------------------------------------------------------------------
Copyright © 2019 Adobe, 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
Expand Down Expand Up @@ -18431,8 +18593,8 @@ We recommend reading one or more of these references before trying to
understand the innards of the JPEG software.

The best short technical introduction to the JPEG compression algorithm is
Wallace, Gregory K. "The JPEG Still Picture Compression Standard",
Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
Wallace, Gregory K. "The JPEG Still Picture Compression Standard",
Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
(Adjacent articles in that issue discuss MPEG motion picture compression,
applications of JPEG, and related topics.) If you don't have the CACM issue
handy, a PDF file containing a revised version of Wallace's article is
Expand Down Expand Up @@ -18500,8 +18662,8 @@ and other news.answers archive sites, including the official news.answers
archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
If you don't have Web or FTP access, send e-mail to [email protected]
with body
send usenet/news.answers/jpeg-faq/part1
send usenet/news.answers/jpeg-faq/part2
send usenet/news.answers/jpeg-faq/part1
send usenet/news.answers/jpeg-faq/part2

FILE FORMAT WARS
================
Expand Down Expand Up @@ -23186,4 +23348,4 @@ freely, subject to the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
====================================================================================================
Total license count: 361
Total license count: 366
8 changes: 4 additions & 4 deletions third_party/txt/tests/paragraph_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ TEST_F(ParagraphTest, DISABLE_ON_MAC(LineMetricsParagraph2)) {
ASSERT_EQ(paragraph->GetLineMetrics()[0].hard_break, false);
ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].ascent, 27.84);
ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].descent, 7.6799998);
ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].width, 349.22266);
ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].width, 349.21875);
ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].left, 0.0);
ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].baseline, 28.32);
ASSERT_EQ(paragraph->GetLineMetrics()[0].line_number, 0ull);
Expand Down Expand Up @@ -4457,9 +4457,9 @@ TEST_F(ParagraphTest, KernScaleParagraph) {

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.37109375f);
EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 230.87109375f);
EXPECT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 253.36328125f);
EXPECT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 207.36328125f);
EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 230.86328125f);
EXPECT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 253.35546875f);
}

TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(NewlineParagraph)) {
Expand Down

0 comments on commit 5061b61

Please sign in to comment.