AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Roll ICU and Harfbuzz

Browse Source 
Updating the bots to MSVC 2019 requires a newer ICU (to fix an issue
with usage of std::atomic), and updating ICU requires updating HB.

Change-Id: I889add046b957d7699cb8c3cafb9dd91b3e588d4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261540
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-12-26 12:41:28 -05:00 committed by Skia Commit-Bot
parent e19d055814
commit 1e5672715a
5 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -13,8 +13,8 @@ deps = {
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
"third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a",
"third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@0a3d2bb99b45b72e1d45185ab054efa993d97210",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@1bada656a86e9cb27d4a6b9fcc50748f0bd9c1d9",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@407b39301e71006b68bd38e770f35d32398a7b14",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@3a74ee528255cc027d84b204a87b5c25e47bff79",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@dbd3825b31041d782c5b504c59dcfb5ac7dda08c",
"third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@d38d7c6628bebd02692cfdd6fa76b4d992a35b75",
"third_party/externals/libgifcodec" : "https://skia.googlesource.com/libgifcodec@38d9c73f49b861bb4a9829371ac311544b120023",
"third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git@574f3a772c96dc9db2c98ef24706feb3f6dbda9a",

44
third_party/harfbuzz/BUILD.gn vendored
View File

@ -58,17 +58,23 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-aat-fdsc-table.hh",
"$_src/hb-aat-layout-ankr-table.hh",
"$_src/hb-aat-layout-bsln-table.hh",
"$_src/hb-aat-layout-common.hh",
"$_src/hb-aat-layout-feat-table.hh",
"$_src/hb-aat-layout-just-table.hh",
"$_src/hb-aat-layout-kerx-table.hh",
"$_src/hb-aat-layout-lcar-table.hh",
"$_src/hb-aat-layout-morx-table.hh",
"$_src/hb-aat-layout-opbd-table.hh",
"$_src/hb-aat-layout-trak-table.hh",
"$_src/hb-aat-layout.cc",
"$_src/hb-aat-layout.hh",
"$_src/hb-aat-ltag-table.hh",
"$_src/hb-aat-map.cc",
"$_src/hb-aat-map.hh",
"$_src/hb-algs.hh",
"$_src/hb-array.hh",
"$_src/hb-atomic.hh",
"$_src/hb-bimap.hh",
"$_src/hb-blob.cc",
"$_src/hb-blob.hh",
"$_src/hb-buffer-deserialize-json.hh",
@ -84,17 +90,32 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-cff2-interp-cs.hh",
"$_src/hb-common.cc",
"$_src/hb-config.hh",
"$_src/hb-coretext.cc",
"$_src/hb-debug.hh",
"$_src/hb-directwrite.cc",
"$_src/hb-dispatch.hh",
"$_src/hb-face.cc",
"$_src/hb-face.hh",
"$_src/hb-fallback-shape.cc",
"$_src/hb-font.cc",
"$_src/hb-font.hh",
"$_src/hb-ft.cc",
"$_src/hb-gdi.cc",
"$_src/hb-glib.cc",
"$_src/hb-gobject-structs.cc",
"$_src/hb-graphite2.cc",
"$_src/hb-icu.cc",
"$_src/hb-iter.hh",
"$_src/hb-kern.hh",
"$_src/hb-machinery.hh",
"$_src/hb-map.cc",
"$_src/hb-map.hh",
"$_src/hb-meta.hh",
"$_src/hb-mutex.hh",
"$_src/hb-null.hh",
"$_src/hb-number-parser.hh",
"$_src/hb-number.cc",
"$_src/hb-number.hh",
"$_src/hb-object.hh",
"$_src/hb-open-file.hh",
"$_src/hb-open-type.hh",
@ -103,13 +124,19 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-cff1-table.hh",
"$_src/hb-ot-cff2-table.cc",
"$_src/hb-ot-cff2-table.hh",
"$_src/hb-ot-cmap-table.hh",
"$_src/hb-ot-color-cbdt-table.hh",
"$_src/hb-ot-color-colr-table.hh",
"$_src/hb-ot-color-cpal-table.hh",
"$_src/hb-ot-color-sbix-table.hh",
"$_src/hb-ot-color-svg-table.hh",
"$_src/hb-ot-color.cc",
"$_src/hb-ot-face-table-list.hh",
"$_src/hb-ot-face.cc",
"$_src/hb-ot-face.hh",
"$_src/hb-ot-font.cc",
"$_src/hb-ot-gasp-table.hh",
"$_src/hb-ot-glyf-table.hh",
"$_src/hb-ot-hdmx-table.hh",
"$_src/hb-ot-head-table.hh",
"$_src/hb-ot-hhea-table.hh",
@ -121,6 +148,7 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-layout-gpos-table.hh",
"$_src/hb-ot-layout-gsub-table.hh",
"$_src/hb-ot-layout-gsubgpos.hh",
"$_src/hb-ot-layout-jstf-table.hh",
"$_src/hb-ot-layout.cc",
"$_src/hb-ot-layout.hh",
"$_src/hb-ot-map.cc",
@ -128,14 +156,21 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-math-table.hh",
"$_src/hb-ot-math.cc",
"$_src/hb-ot-maxp-table.hh",
"$_src/hb-ot-meta-table.hh",
"$_src/hb-ot-meta.cc",
"$_src/hb-ot-metrics.cc",
"$_src/hb-ot-metrics.hh",
"$_src/hb-ot-name-language-static.hh",
"$_src/hb-ot-name-language.hh",
"$_src/hb-ot-name-table.hh",
"$_src/hb-ot-name.cc",
"$_src/hb-ot-os2-table.hh",
"$_src/hb-ot-os2-unicode-ranges.hh",
"$_src/hb-ot-post-macroman.hh",
"$_src/hb-ot-post-table.hh",
"$_src/hb-ot-shape-complex-arabic-fallback.hh",
"$_src/hb-ot-shape-complex-arabic-table.hh",
"$_src/hb-ot-shape-complex-arabic-win1256.hh",
"$_src/hb-ot-shape-complex-arabic.cc",
"$_src/hb-ot-shape-complex-arabic.hh",
"$_src/hb-ot-shape-complex-default.cc",
@ -165,12 +200,16 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-shape-normalize.hh",
"$_src/hb-ot-shape.cc",
"$_src/hb-ot-shape.hh",
"$_src/hb-ot-stat-table.hh",
"$_src/hb-ot-tag-table.hh",
"$_src/hb-ot-tag.cc",
"$_src/hb-ot-var-avar-table.hh",
"$_src/hb-ot-var-fvar-table.hh",
"$_src/hb-ot-var-gvar-table.hh",
"$_src/hb-ot-var-hvar-table.hh",
"$_src/hb-ot-var-mvar-table.hh",
"$_src/hb-ot-var.cc",
"$_src/hb-ot-vorg-table.hh",
"$_src/hb-pool.hh",
"$_src/hb-sanitize.hh",
"$_src/hb-serialize.hh",
@ -189,7 +228,9 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-subset-cff-common.cc",
"$_src/hb-subset-cff-common.hh",
"$_src/hb-subset-cff1.cc",
"$_src/hb-subset-cff1.hh",
"$_src/hb-subset-cff2.cc",
"$_src/hb-subset-cff2.hh",
"$_src/hb-subset-input.cc",
"$_src/hb-subset-input.hh",
"$_src/hb-subset-plan.cc",
@ -201,8 +242,9 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-unicode-emoji-table.hh",
"$_src/hb-unicode.cc",
"$_src/hb-unicode.hh",
"$_src/hb-uniscribe.cc",
"$_src/hb-utf.hh",
"$_src/hb-warning.cc",
"$_src/hb-vector.hh",
"$_src/hb.hh",
]
}

2
third_party/icu/BUILD.gn vendored
View File

@ -36,7 +36,7 @@ if (skia_use_system_icu) {
}
action("make_data_assembly") {
if (target_cpu == "wasm") {
_u_icu_version_major_num = "63" # defined in source/common/unicode/uvernum.h
_u_icu_version_major_num = "65" # defined in source/common/unicode/uvernum.h
script = "make_data_cpp.py"
inputs = [
"$data_dir/icudtl.dat",

6
third_party/icu/icu.gni vendored
View File

@ -500,7 +500,6 @@ icu_sources = [
"$_src/i18n/double-conversion-bignum.h",
"$_src/i18n/double-conversion-cached-powers.cpp",
"$_src/i18n/double-conversion-cached-powers.h",
"$_src/i18n/double-conversion-diy-fp.cpp",
"$_src/i18n/double-conversion-diy-fp.h",
"$_src/i18n/double-conversion-fast-dtoa.cpp",
"$_src/i18n/double-conversion-fast-dtoa.h",
@ -508,7 +507,6 @@ icu_sources = [
"$_src/i18n/double-conversion-strtod.cpp",
"$_src/i18n/double-conversion-strtod.h",
"$_src/i18n/double-conversion-utils.h",
"$_src/i18n/double-conversion.cpp",
"$_src/i18n/double-conversion.h",
"$_src/i18n/dt_impl.h",
"$_src/i18n/dtfmtsym.cpp",
@ -607,8 +605,6 @@ icu_sources = [
"$_src/i18n/number_scientific.h",
"$_src/i18n/number_skeletons.cpp",
"$_src/i18n/number_skeletons.h",
"$_src/i18n/number_stringbuilder.cpp",
"$_src/i18n/number_stringbuilder.h",
"$_src/i18n/number_types.h",
"$_src/i18n/number_utils.cpp",
"$_src/i18n/number_utils.h",
@ -627,8 +623,6 @@ icu_sources = [
"$_src/i18n/numparse_parsednumber.cpp",
"$_src/i18n/numparse_scientific.cpp",
"$_src/i18n/numparse_scientific.h",
"$_src/i18n/numparse_stringsegment.cpp",
"$_src/i18n/numparse_stringsegment.h",
"$_src/i18n/numparse_symbols.cpp",
"$_src/i18n/numparse_symbols.h",
"$_src/i18n/numparse_types.h",

6
third_party/third_party.gni vendored
View File

@ -56,7 +56,11 @@ template("third_party") {
# Warnings are just noise if we're not maintaining the code.
if (is_win) {
cflags = [ "/w" ]
# 4244 (conversion from 'double' to 'float') is triggering even with "/w". Sigh.
cflags = [
"/w",
"/wd4244",
]
} else {
cflags = [ "-w" ]
}