Commit 39cc339e authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Remove dependency on //third_party/harfbuzz on iOS.

Chrome on iOS only uses a subset of skia (see ios/chrome/DEPS).
That subset does not include fonts rendering, so the dependency
on //third_party/freetype and //third_party/harfbuzz can be
removed.

Bug: none
Change-Id: Ie3adf4abab442428986eafe074da0447b169db4e
Reviewed-on: https://chromium-review.googlesource.com/697586Reviewed-by: default avatarRohit Rao (ping after 24h) <rohitrao@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506770}
parent c6f65f76
...@@ -129,7 +129,7 @@ config("skia_library_config") { ...@@ -129,7 +129,7 @@ config("skia_library_config") {
defines = [] defines = []
if (!use_system_freetype) { if (!is_ios && !use_system_freetype) {
defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ] defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
} }
...@@ -282,18 +282,14 @@ component("skia") { ...@@ -282,18 +282,14 @@ component("skia") {
"//third_party/skia/src/fonts/SkFontMgr_indirect.cpp", "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
"//third_party/skia/src/fonts/SkRemotableFontMgr.cpp", "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
"//third_party/skia/src/images/SkImageEncoder.cpp", "//third_party/skia/src/images/SkImageEncoder.cpp",
"//third_party/skia/src/images/SkJPEGWriteUtility.cpp",
"//third_party/skia/src/images/SkJpegEncoder.cpp",
"//third_party/skia/src/images/SkPngEncoder.cpp", "//third_party/skia/src/images/SkPngEncoder.cpp",
"//third_party/skia/src/images/SkWebpEncoder.cpp", "//third_party/skia/src/images/SkWebpEncoder.cpp",
"//third_party/skia/src/ports/SkGlobalInitialization_default.cpp", "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
"//third_party/skia/src/ports/SkImageGenerator_none.cpp",
"//third_party/skia/src/ports/SkOSFile_stdio.cpp", "//third_party/skia/src/ports/SkOSFile_stdio.cpp",
"//third_party/skia/src/sfnt/SkOTTable_name.cpp", "//third_party/skia/src/sfnt/SkOTTable_name.cpp",
"//third_party/skia/src/sfnt/SkOTUtils.cpp", "//third_party/skia/src/sfnt/SkOTUtils.cpp",
] ]
if (!is_ios) { if (!is_ios) {
sources -= [ "//third_party/skia/src/ports/SkImageGenerator_none.cpp" ]
sources += [ sources += [
"//third_party/skia/src/codec/SkBmpBaseCodec.cpp", "//third_party/skia/src/codec/SkBmpBaseCodec.cpp",
"//third_party/skia/src/codec/SkBmpCodec.cpp", "//third_party/skia/src/codec/SkBmpCodec.cpp",
...@@ -315,9 +311,13 @@ component("skia") { ...@@ -315,9 +311,13 @@ component("skia") {
"//third_party/skia/src/codec/SkSwizzler.cpp", "//third_party/skia/src/codec/SkSwizzler.cpp",
"//third_party/skia/src/codec/SkWbmpCodec.cpp", "//third_party/skia/src/codec/SkWbmpCodec.cpp",
"//third_party/skia/src/codec/SkWebpCodec.cpp", "//third_party/skia/src/codec/SkWebpCodec.cpp",
"//third_party/skia/src/images/SkJPEGWriteUtility.cpp",
"//third_party/skia/src/images/SkJpegEncoder.cpp",
"//third_party/skia/src/ports/SkImageGenerator_skia.cpp", "//third_party/skia/src/ports/SkImageGenerator_skia.cpp",
"//third_party/skia/third_party/gif/SkGifImageReader.cpp", "//third_party/skia/third_party/gif/SkGifImageReader.cpp",
] ]
} else {
sources += [ "//third_party/skia/src/ports/SkImageGenerator_none.cpp" ]
} }
# This and skia_opts are really the same conceptual target so share headers. # This and skia_opts are really the same conceptual target so share headers.
...@@ -368,11 +368,14 @@ component("skia") { ...@@ -368,11 +368,14 @@ component("skia") {
# Select Skia ports. # Select Skia ports.
# FreeType is needed everywhere, on Linux and Android as main font backend, on Windows and Mac as fallback backend for Variations. # FreeType is needed everywhere (except on iOS), on Linux and Android as main
sources += [ # font backend, on Windows and Mac as fallback backend for Variations.
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp", if (!is_ios) {
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", sources += [
] "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
]
}
if (is_win) { if (is_win) {
sources += [ sources += [
...@@ -461,18 +464,15 @@ component("skia") { ...@@ -461,18 +464,15 @@ component("skia") {
":skia_opts", ":skia_opts",
"//base", "//base",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//build/config/freetype",
"//third_party:jpeg",
"//third_party/libpng", "//third_party/libpng",
"//third_party/libwebp", "//third_party/libwebp",
] ]
if (is_ios) { if (!is_ios) {
sources -= [ deps += [
"//third_party/skia/src/images/SkJPEGWriteUtility.cpp", "//build/config/freetype",
"//third_party/skia/src/images/SkJpegEncoder.cpp", "//third_party:jpeg",
] ]
deps -= [ "//third_party:jpeg" ]
} }
if (is_linux) { if (is_linux) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment