aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-skia_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-skia_BUILD.gn')
-rw-r--r--www/chromium/files/patch-skia_BUILD.gn19
1 files changed, 14 insertions, 5 deletions
diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn
index ff9f856b82fb..afeec7328ce4 100644
--- a/www/chromium/files/patch-skia_BUILD.gn
+++ b/www/chromium/files/patch-skia_BUILD.gn
@@ -1,6 +1,6 @@
---- skia/BUILD.gn.orig 2017-04-19 19:06:37 UTC
+--- skia/BUILD.gn.orig 2017-06-05 19:03:11 UTC
+++ skia/BUILD.gn
-@@ -127,7 +127,7 @@ config("skia_library_config") {
+@@ -125,7 +125,7 @@ config("skia_library_config") {
}
# Settings for text blitting, chosen to approximate the system browser.
@@ -9,7 +9,7 @@
defines += [
"SK_GAMMA_EXPONENT=1.2",
"SK_GAMMA_CONTRAST=0.2",
-@@ -326,7 +326,7 @@ component("skia") {
+@@ -351,7 +351,7 @@ component("skia") {
set_sources_assignment_filter(sources_assignment_filter)
}
@@ -18,16 +18,25 @@
sources += [
"//third_party/skia/src/ports/SkFontConfigInterface.cpp",
"//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-@@ -335,7 +335,7 @@ component("skia") {
+@@ -360,7 +360,7 @@ component("skia") {
]
}
- if (is_linux || is_android) {
+ if (is_linux || is_bsd || is_android) {
sources += [
+ # Retain the files for the SkFontMgr_Android on linux to emulate android
+ # fonts. See content/zygote/zygote_main_linux.cc
+@@ -370,7 +370,7 @@ component("skia") {
+ ]
+ }
+
+- if (is_linux || is_android || is_win) {
++ if (is_linux || is_bsd || is_android || is_win) {
+ sources += [
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-@@ -374,7 +374,7 @@ component("skia") {
+@@ -409,7 +409,7 @@ component("skia") {
"//base/third_party/dynamic_annotations",
]