summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-11-23 20:25:13 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-23 20:25:13 +0000
commit3636a854af15219fd679ed54207abcdad3283b9b (patch)
treea5cad913aa38817ead166373e252e7983b5aee8e
parent6aec70bc09cb65b169fe6ca1af65e8929aeea43a (diff)
downloadpdfium-chromium/3278.tar.xz
Roll pdfium/third_party/freetype/src/ 8f5568bfc..bec14f688 (5 commits)chromium/3278
https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/8f5568bfc4fd..bec14f688925 $ git log 8f5568bfc..bec14f688 --date=short --no-merges --format='%ad %ae %s' 2017-11-22 ewaldhew * src/psaux/psft.c (cf2_setGlyphWidth): Check format before setting. 2017-11-22 ewaldhew [psaux] Fix CFF advance widths. (#52466) 2017-11-15 vtsyrklevich * include/freetype/ftrender.h: Fix `FT_Renderer_RenderFunc' type. 2017-11-14 madigens Use Adobe hinting engine for `light' hinting of both CFF and Type 1. 2017-11-09 yuri_levchenko * CMakeLists.txt: Add `DISABLE_FORCE_DEBUG_PREFIX' option. Created with: roll-dep pdfium/third_party/freetype/src R=dsinclair@chromium.org,npm@chromium.org,thestig@chromium.org Bug: pdfium:941 Change-Id: I00579a3e26d9cabce7032e0b538de95a1029bac7 Reviewed-on: https://pdfium-review.googlesource.com/19310 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
-rw-r--r--DEPS4
-rw-r--r--third_party/BUILD.gn4
-rw-r--r--third_party/freetype/README.pdfium4
3 files changed, 6 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index 7ab71002ed..d66a423d63 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@ vars = {
'catapult_revision': '0cf3924bab2c2f66a412edda35f6e3572bd57623',
'clang_revision': '4db585405687222660050d58eb12784fe0852884',
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
- 'freetype_revision': '8f5568bfc4fd5fe707f0e41915b57affc1bff0e3',
+ 'freetype_revision': 'bec14f688925467be708f01378fbbf82e6b19b42',
'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271',
'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038',
'icu_revision': '08cb956852a5ccdba7f9c941728bb833529ba3c6',
@@ -18,7 +18,7 @@ vars = {
'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0',
'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76',
'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
- 'pdfium_tests_revision': '3fcb05df32dd74f46b1ce68c957c0452bce404c0',
+ 'pdfium_tests_revision': '3d6228da656a3974d72223a702e6804df494703e',
'skia_revision': 'e0e20755f6c09b71038ced2bf4a00b4c4593f504',
'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290',
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 4a7d15f961..a188f56194 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -98,6 +98,7 @@ if (pdf_bundle_freetype) {
"//third_party/freetype/src/include/freetype/ftcffdrv.h",
"//third_party/freetype/src/include/freetype/fterrdef.h",
"//third_party/freetype/src/include/freetype/fterrors.h",
+ "//third_party/freetype/src/include/freetype/ftfntfmt.h",
"//third_party/freetype/src/include/freetype/ftglyph.h",
"//third_party/freetype/src/include/freetype/ftgzip.h",
"//third_party/freetype/src/include/freetype/ftimage.h",
@@ -159,6 +160,7 @@ if (pdf_bundle_freetype) {
"//third_party/freetype/src/src/base/ftbase.c",
"//third_party/freetype/src/src/base/ftbase.h",
"//third_party/freetype/src/src/base/ftbitmap.c",
+ "//third_party/freetype/src/src/base/ftfntfmt.c",
"//third_party/freetype/src/src/base/ftglyph.c",
"//third_party/freetype/src/src/base/ftinit.c",
"//third_party/freetype/src/src/base/ftlcdfil.c",
@@ -179,9 +181,7 @@ if (pdf_bundle_freetype) {
]
if (pdf_use_skia || pdf_use_skia_paths) {
sources += [
- "//third_party/freetype/src/include/freetype/ftfntfmt.h",
"//third_party/freetype/src/include/freetype/ftsynth.h",
- "//third_party/freetype/src/src/base/ftfntfmt.c",
"//third_party/freetype/src/src/base/ftfstype.c",
"//third_party/freetype/src/src/base/fttype1.c",
]
diff --git a/third_party/freetype/README.pdfium b/third_party/freetype/README.pdfium
index a36a91eeaf..88bbe320b7 100644
--- a/third_party/freetype/README.pdfium
+++ b/third_party/freetype/README.pdfium
@@ -1,7 +1,7 @@
Name: FreeType
URL: http://www.freetype.org/
-Version: VER-2-8-1-115
-Revision: 8f5568bfc4fd5fe707f0e41915b57affc1bff0e3
+Version: VER-2-8-1-120
+Revision: bec14f688925467be708f01378fbbf82e6b19b42
Security Critical: yes
License: FreeType License (FTL)
License File: FTL.TXT