summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Wanger <bungeman@chromium.org>2017-02-09 11:21:11 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-09 16:55:18 +0000
commit9d5fd1de29538ab04c23ec9d11d22683e5c53e43 (patch)
tree39d800e8f47b68448ae784c6ec3e7a2a1575e9f6
parent118a8e28783f42e089721eac4880f3b3f683e832 (diff)
downloadpdfium-9d5fd1de29538ab04c23ec9d11d22683e5c53e43.tar.xz
Roll third_party/skia from f44703a to 90e3cd789
https://skia.googlesource.com/skia.git/+log/f44703a87f532..90e3cd78991 A file was split out to reduce dependencies, added to BUILD.gn. Change-Id: If3675ddc3b06fcb3fe5cad1165d6fe6d4168a152 Reviewed-on: https://pdfium-review.googlesource.com/2590 Commit-Queue: Ben Wagner <bungeman@chromium.org> Commit-Queue: Cary Clark <caryclark@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
-rw-r--r--DEPS2
-rw-r--r--skia/BUILD.gn1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 9888af5457..2057e4edaa 100644
--- a/DEPS
+++ b/DEPS
@@ -16,7 +16,7 @@ vars = {
'icu_revision': '73e24736676b4b438270fda44e5b2c83b49fdd80',
'instrumented_lib_revision': '45f5814b1543e41ea0be54c771e3840ea52cca4a',
'pdfium_tests_revision': 'd25a422ab03d6c3109370bc454c629575e969329',
- 'skia_revision': 'f44703a87f532b3f593d91605d66d52c6bbc45c9',
+ 'skia_revision': '90e3cd78991ef337dbd0023efb30ece864694308',
'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290',
'v8_revision': '8e0dcfc4ac75c0bef9063bd5dec4dafaa3409b6d',
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 33842278f9..723e872b0d 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -205,6 +205,7 @@ component("skia") {
#pdfium
"//third_party/skia/src/ports/SkDiscardableMemory_none.cpp",
"//third_party/skia/src/ports/SkFontMgr_custom.cpp",
+ "//third_party/skia/src/ports/SkFontMgr_custom_empty.cpp",
"//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp",
"//third_party/skia/src/ports/SkMemory_malloc.cpp",
]