summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--skia/BUILD.gn21
-rw-r--r--skia/skia_gn_files.gypi12
-rw-r--r--skia/skia_library.gypi2
-rw-r--r--skia/skia_pdfium.gypi3
4 files changed, 13 insertions, 25 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 7fb49b8e40..97f6d583e2 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -112,6 +112,8 @@ config("skia_config") {
"//third_party/skia/include/pipe",
"//third_party/skia/include/ports",
"//third_party/skia/include/utils",
+ # TODO(dsinclair): Right way to use //third_party/freetype?
+ "//third_party/freetype/include",
]
defines = []
@@ -241,7 +243,7 @@ config("skia_library_config") {
component("skia") {
sources = [
- # Chrome sources.
+ # PDFium sources.
"config/SkUserConfig.h",
"ext/google_logging.cc",
]
@@ -275,7 +277,6 @@ component("skia") {
"//third_party/skia/src/utils/SkLayer.cpp",
"//third_party/skia/src/utils/SkMeshUtils.cpp",
"//third_party/skia/src/utils/SkNinePatch.cpp",
- "//third_party/skia/src/utils/SkOSFile.cpp",
"//third_party/skia/src/utils/SkParsePath.cpp",
#testing
@@ -342,15 +343,6 @@ component("skia") {
]
}
- # Add the files for the SkFontMgr_Android. This is used to emulate android
- # fonts on linux. See content/zygote/zygote_main_linux.cc
- if (is_linux) {
- sources += [
- "//third_party/skia/src/ports/SkFontMgr_android.cpp",
- "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
- ]
- }
-
if (!is_linux && !is_android) {
sources -= [
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
@@ -379,14 +371,7 @@ component("skia") {
]
if (is_linux) {
- if (use_pango) {
- configs += [ "//build/config/linux/pangocairo" ]
- }
deps += [
- "//build/linux:fontconfig",
- "//build/linux:freetype2",
-
- # "//third_party/expat",
"//third_party/icu:icuuc",
]
}
diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi
index 42bdc47a48..7f7495996a 100644
--- a/skia/skia_gn_files.gypi
+++ b/skia/skia_gn_files.gypi
@@ -5,12 +5,8 @@
'skia_library_sources': [
'<(skia_src_path)/ports/SkImageGenerator_none.cpp',
- '<(skia_src_path)/fonts/SkFontMgr_fontconfig.cpp',
'<(skia_src_path)/fonts/SkFontMgr_indirect.cpp',
'<(skia_src_path)/fonts/SkRemotableFontMgr.cpp',
- '<(skia_src_path)/ports/SkFontConfigInterface_direct.cpp',
- '<(skia_src_path)/ports/SkFontConfigInterface_direct_factory.cpp',
- '<(skia_src_path)/ports/SkFontHost_fontconfig.cpp',
'<(skia_src_path)/ports/SkFontHost_FreeType_common.cpp',
'<(skia_src_path)/ports/SkFontHost_FreeType.cpp',
'<(skia_src_path)/ports/SkFontHost_mac.cpp',
@@ -22,9 +18,9 @@
'<(skia_src_path)/ports/SkGlobalInitialization_default.cpp',
'<(skia_src_path)/ports/SkImageEncoder_none.cpp',
'<(skia_src_path)/ports/SkOSFile_posix.cpp',
- '<(skia_src_path)/ports/SkRemotableFontMgr_win_dw.cpp',
'<(skia_src_path)/ports/SkOSFile_stdio.cpp',
'<(skia_src_path)/ports/SkOSFile_win.cpp',
+ '<(skia_src_path)/ports/SkRemotableFontMgr_win_dw.cpp',
'<(skia_src_path)/ports/SkScalerContext_win_dw.cpp',
'<(skia_src_path)/ports/SkTLS_pthread.cpp',
'<(skia_src_path)/ports/SkTLS_win.cpp',
@@ -39,5 +35,11 @@
#testing
'<(skia_src_path)/fonts/SkGScalerContext.cpp',
+
+ #pdfium
+ '<(skia_src_path)/ports/SkDiscardableMemory_none.cpp',
+ '<(skia_src_path)/ports/SkFontMgr_custom.cpp',
+ '<(skia_src_path)/ports/SkFontMgr_custom_empty_factory.cpp',
+ '<(skia_src_path)/ports/SkMemory_malloc.cpp',
],
}
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index dd3d240a0c..a4eb0abf30 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -5,7 +5,7 @@
# This gypi file contains the Skia library.
# In component mode (shared_lib) it is folded into a single shared library with
-# the Chrome-specific enhancements but in all other cases it is a separate lib.
+# the PDFium-specific enhancements but in all other cases it is a separate lib.
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# variables and defines should go in skia_common.gypi so they can be seen
diff --git a/skia/skia_pdfium.gypi b/skia/skia_pdfium.gypi
index 0de3f84d72..5c80a4b9fd 100644
--- a/skia/skia_pdfium.gypi
+++ b/skia/skia_pdfium.gypi
@@ -3,7 +3,7 @@
# found in the LICENSE file.
-# This gypi file contains all the Chrome-specific enhancements to Skia.
+# This gypi file contains all the PDFium-specific enhancements to Skia.
# In component mode (shared_lib) it is folded into a single shared library with
# the Skia files but in all other cases it is a separate library.
{
@@ -24,6 +24,7 @@
],
},
'sources': [
+ 'config/SkUserConfig.h',
'ext/google_logging.cc',
],
}