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

Roll HarfBuzz (946 commits).

Browse Source 
4f37ab63de..1bada656a8

Change-Id: If8b08033b72e151c2255502ac447af267c815de6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221545
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Ben Wagner 2019-06-18 10:52:34 -04:00 committed by Skia Commit-Bot
parent 056420428d
commit 88b6e8764e
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -12,7 +12,7 @@ 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@android-6.0.1_r55",
"third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@7edc937fe679d14d66f55cf6f7fa607925d38f3c",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@4f37ab63de9705d7bf74ee75364747e41b7c06a1",
"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/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@d38d7c6628bebd02692cfdd6fa76b4d992a35b75",
"third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git@2.0.0",

61
third_party/harfbuzz/BUILD.gn vendored
View File

@ -25,11 +25,35 @@ if (skia_use_system_harfbuzz) {
defines = [
"HAVE_ICU",
"HAVE_ICU_BUILTIN",
"HAVE_INTEL_ATOMIC_PRIMITIVES",
"HAVE_OT",
]
deps = [
"//third_party/icu",
]
public = [
"$_src/hb-blob.h",
"$_src/hb-buffer.h",
"$_src/hb-common.h",
"$_src/hb-deprecated.h",
"$_src/hb-face.h",
"$_src/hb-font.h",
"$_src/hb-icu.h",
"$_src/hb-map.h",
"$_src/hb-ot-font.h",
"$_src/hb-ot-layout.h",
"$_src/hb-ot-math.h",
"$_src/hb-ot-shape.h",
"$_src/hb-ot-var.h",
"$_src/hb-ot.h",
"$_src/hb-set.h",
"$_src/hb-shape-plan.h",
"$_src/hb-shape.h",
"$_src/hb-subset.h",
"$_src/hb-unicode.h",
"$_src/hb-version.h",
"$_src/hb.h",
]
sources = [
"$_src/hb-aat-fdsc-table.hh",
"$_src/hb-aat-layout-ankr-table.hh",
@ -42,16 +66,15 @@ if (skia_use_system_harfbuzz) {
"$_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-blob.cc",
"$_src/hb-blob.h",
"$_src/hb-blob.hh",
"$_src/hb-buffer-deserialize-json.hh",
"$_src/hb-buffer-deserialize-text.hh",
"$_src/hb-buffer-serialize.cc",
"$_src/hb-buffer.cc",
"$_src/hb-buffer.h",
"$_src/hb-buffer.hh",
"$_src/hb-cache.hh",
"$_src/hb-cff-interp-common.hh",
@ -60,19 +83,17 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-cff1-interp-cs.hh",
"$_src/hb-cff2-interp-cs.hh",
"$_src/hb-common.cc",
"$_src/hb-common.h",
"$_src/hb-config.hh",
"$_src/hb-debug.hh",
"$_src/hb-deprecated.h",
"$_src/hb-dsalgs.hh",
"$_src/hb-dispatch.hh",
"$_src/hb-face.cc",
"$_src/hb-face.h",
"$_src/hb-face.hh",
"$_src/hb-font.cc",
"$_src/hb-font.h",
"$_src/hb-font.hh",
"$_src/hb-icu.cc",
"$_src/hb-icu.h",
"$_src/hb-map.cc",
"$_src/hb-map.hh",
"$_src/hb-meta.hh",
"$_src/hb-mutex.hh",
"$_src/hb-object.hh",
"$_src/hb-open-file.hh",
@ -85,11 +106,9 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-color-cbdt-table.hh",
"$_src/hb-ot-color-colr-table.hh",
"$_src/hb-ot-color-cpal-table.hh",
"$_src/hb-ot-deprecated.h",
"$_src/hb-ot-face.cc",
"$_src/hb-ot-face.hh",
"$_src/hb-ot-font.cc",
"$_src/hb-ot-font.h",
"$_src/hb-ot-gasp-table.hh",
"$_src/hb-ot-hdmx-table.hh",
"$_src/hb-ot-head-table.hh",
@ -103,15 +122,13 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-layout-gsub-table.hh",
"$_src/hb-ot-layout-gsubgpos.hh",
"$_src/hb-ot-layout.cc",
"$_src/hb-ot-layout.h",
"$_src/hb-ot-layout.hh",
"$_src/hb-ot-map.cc",
"$_src/hb-ot-map.hh",
"$_src/hb-ot-math-table.hh",
"$_src/hb-ot-math.cc",
"$_src/hb-ot-math.h",
"$_src/hb-ot-maxp-table.hh",
"$_src/hb-ot-name-language.cc",
"$_src/hb-ot-name-language-static.hh",
"$_src/hb-ot-name-language.hh",
"$_src/hb-ot-name-table.hh",
"$_src/hb-ot-name.cc",
@ -147,7 +164,6 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-shape-normalize.cc",
"$_src/hb-ot-shape-normalize.hh",
"$_src/hb-ot-shape.cc",
"$_src/hb-ot-shape.h",
"$_src/hb-ot-shape.hh",
"$_src/hb-ot-tag.cc",
"$_src/hb-ot-var-avar-table.hh",
@ -155,17 +171,15 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-ot-var-hvar-table.hh",
"$_src/hb-ot-var-mvar-table.hh",
"$_src/hb-ot-var.cc",
"$_src/hb-ot-var.h",
"$_src/hb-ot.h",
"$_src/hb-pool.hh",
"$_src/hb-sanitize.hh",
"$_src/hb-serialize.hh",
"$_src/hb-set-digest.hh",
"$_src/hb-set.cc",
"$_src/hb-set.h",
"$_src/hb-set.hh",
"$_src/hb-shape-plan.cc",
"$_src/hb-shape-plan.h",
"$_src/hb-shape-plan.hh",
"$_src/hb-shape.cc",
"$_src/hb-shape.h",
"$_src/hb-shaper-impl.hh",
"$_src/hb-shaper-list.hh",
"$_src/hb-shaper.cc",
@ -176,22 +190,19 @@ if (skia_use_system_harfbuzz) {
"$_src/hb-subset-cff-common.hh",
"$_src/hb-subset-cff1.cc",
"$_src/hb-subset-cff2.cc",
"$_src/hb-subset-glyf.cc",
"$_src/hb-subset-glyf.hh",
"$_src/hb-subset-input.cc",
"$_src/hb-subset-input.hh",
"$_src/hb-subset-plan.cc",
"$_src/hb-subset-plan.hh",
"$_src/hb-subset.cc",
"$_src/hb-subset.h",
"$_src/hb-subset.hh",
"$_src/hb-ucd-table.hh",
"$_src/hb-ucd.cc",
"$_src/hb-unicode-emoji-table.hh",
"$_src/hb-unicode.cc",
"$_src/hb-unicode.h",
"$_src/hb-unicode.hh",
"$_src/hb-utf.hh",
"$_src/hb-version.h",
"$_src/hb-warning.cc",
"$_src/hb.h",
"$_src/hb.hh",
]
}