Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: skia/BUILD.gn

Issue 2858573002: Use FreeType for OpenType Variations on CoreText < 10.12 (Closed)
Patch Set: Use FreeType for OpenType Variations on CoreText < 10.12 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/NeverFixTests » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 853e365e9a95c9dd051bf57bdb6a29f0b5ec7109..97b0a7108a35c3d9a903ac837ac7be2e47fff379 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -44,7 +44,7 @@ config("skia_config") {
defines = skia_for_chromium_defines
- if (is_win) {
+ if (is_win || is_mac) {
defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ]
}
@@ -323,6 +323,13 @@ component("skia") {
}
# Select Skia ports.
+
+ # FreeType is needed everywhere, on Linux and Android as main font backend, on Windows and Mac as fallback backend for Variations.
+ sources += [
+ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
+ "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+ ]
+
if (is_win) {
sources += [
"//third_party/skia/src/ports/SkFontHost_win.cpp",
@@ -368,19 +375,16 @@ component("skia") {
]
}
- if (is_linux || is_android || is_win) {
+ if (is_win || is_mac) {
sources += [
- "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
- "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+ # Add the FreeType custom font manager as a fallback backend for variable fonts.
+ "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
+ "//third_party/skia/src/ports/SkFontMgr_custom_empty.cpp",
]
}
if (is_win) {
sources += [
- # Add the custom FreeType font manager to instantiate variable fonts on Windows.
- "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
- "//third_party/skia/src/ports/SkFontMgr_custom_empty.cpp",
-
# Select the right BitmapPlatformDevice.
"ext/raster_handle_allocator_win.cc",
]
@@ -405,6 +409,7 @@ component("skia") {
":skia_opts",
"//base",
"//base/third_party/dynamic_annotations",
+ "//build/config/freetype",
]
if (is_linux) {
@@ -412,7 +417,6 @@ component("skia") {
configs += [ "//build/config/linux/pangocairo" ]
}
deps += [
- "//build/config/freetype",
"//build/linux:fontconfig",
"//third_party/expat",
"//third_party/icu:icuuc",
@@ -426,10 +430,6 @@ component("skia") {
]
}
- if (is_win || is_android) {
- deps += [ "//build/config/freetype" ]
- }
-
if (skia_support_pdf) {
deps += [
"//third_party/sfntly",
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/NeverFixTests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698