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

Unified Diff: skia/BUILD.gn

Issue 2786433004: Support for OpenType Font Variations on Windows (Closed)
Patch Set: Created 3 years, 9 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 | « DEPS ('k') | 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 df0f01764306642c39a8a56812f1a55745deec22..a6c38df052639fc47e2b146aaa5053de60cda11a 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -43,6 +43,10 @@ config("skia_config") {
defines = skia_for_chromium_defines
+ if (is_win) {
+ defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) << 24) | ((FREETYPE_MINOR) << 16) | ((FREETYPE_PATCH) << 8))" ]
+ }
+
if (is_component_build) {
defines += [
"SKIA_DLL",
@@ -358,9 +362,6 @@ component("skia") {
if (is_linux || is_android) {
sources += [
- "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
- "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-
# Retain the files for the SkFontMgr_Android on linux to emulate android
# fonts. See content/zygote/zygote_main_linux.cc
# Note that this requires expat.
@@ -369,9 +370,22 @@ component("skia") {
]
}
- # Select the right BitmapPlatformDevice.
+ if (is_linux || is_android || is_win) {
+ sources += [
+ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
+ "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+ ]
+ }
+
if (is_win) {
- sources += [ "ext/raster_handle_allocator_win.cc" ]
+ 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",
+ ]
}
if (is_clang && !is_nacl) {
@@ -400,8 +414,8 @@ component("skia") {
configs += [ "//build/config/linux/pangocairo" ]
}
deps += [
- "//build/linux:fontconfig",
"//build/config/freetype",
+ "//build/linux:fontconfig",
"//third_party/expat",
"//third_party/icu:icuuc",
]
@@ -411,10 +425,13 @@ component("skia") {
deps += [
"//third_party/android_tools:cpu_features",
"//third_party/expat",
- "//build/config/freetype",
]
}
+ if (is_win || is_android) {
+ deps += [ "//build/config/freetype" ]
+ }
+
if (skia_support_pdf) {
deps += [
"//third_party/sfntly",
« no previous file with comments | « DEPS ('k') | third_party/WebKit/LayoutTests/NeverFixTests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698