Commit 5e4114c0 authored by Ben Wagner's avatar Ben Wagner Committed by Commit Bot

Roll src/third_party/freetype/src/ 61ee69a66..26ad1acbc (5 commits)

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/61ee69a66e73..26ad1acbcb4c

$ git log 61ee69a66..26ad1acbc --date=short --no-merges --format='%ad %ae %s'
2018-04-04 mpsuzuki * src/truetype/ttobjs.c (trick_names): Add 3 tricky fonts (#53554), `DFHei-Md-HK-BF', `DFKaiShu-Md-HK-BF' and `DFMing-Bd-HK-BF'. (tt_check_trickyness_sfnt_ids): Add checksums for 3 tricky fonts in above.
2018-04-03 wl Minor comment improvement.
2018-04-01 wl * builds/toplevel.mk (work): Use $(SEP).
2018-03-30 wl [truetype] Fix memory leak (only if tracing is on).
2018-03-26 apodtele Documentation improvement.

Created with:
  roll-dep src/third_party/freetype/src
R=bungeman@chromium.org,drott@chromium.org
BUG=chromium:811110

CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_msan_rel_ng

PDFium-Issue: pdfium:1053
ChromiumOS-Issue: chromium:825973
Change-Id: Icfc49484a500e0c75edebb7d58b76d3c7442d5ea
Reviewed-on: https://chromium-review.googlesource.com/995918
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548408}
parent 94a493b2
...@@ -134,7 +134,7 @@ vars = { ...@@ -134,7 +134,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype # the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other. # and whatever else without interference from each other.
'freetype_revision': '61ee69a66e73f33a955d263bcb4d40e62dfe6286', 'freetype_revision': '26ad1acbcb4ca9e25163bd102971c8f0e1b56d87',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling HarfBuzz # the commit queue can handle CLs rolling HarfBuzz
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
Name: FreeType Name: FreeType
URL: http://www.freetype.org/ URL: http://www.freetype.org/
Version: VER-2-9-41 Version: VER-2-9-46
Revision: 61ee69a66e73f33a955d263bcb4d40e62dfe6286 Revision: 26ad1acbcb4ca9e25163bd102971c8f0e1b56d87
License: Custom license "inspired by the BSD, Artistic, and IJG (Independent License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
JPEG Group) licenses" JPEG Group) licenses"
License File: src/docs/FTL.TXT License File: src/docs/FTL.TXT
......
...@@ -82,6 +82,10 @@ FT_BEGIN_HEADER ...@@ -82,6 +82,10 @@ FT_BEGIN_HEADER
/* to control the various font drivers and modules. The controllable */ /* to control the various font drivers and modules. The controllable */
/* properties are listed in the section @properties. */ /* properties are listed in the section @properties. */
/* */ /* */
/* You have to undefine this configuration option on platforms that lack */
/* the concept of environment variables (and thus don't have the */
/* `getenv' function), for example Windows CE. */
/* */
/* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
/* multiple lines for better readability). */ /* multiple lines for better readability). */
/* */ /* */
......
...@@ -17,10 +17,12 @@ addtrybots() { ...@@ -17,10 +17,12 @@ addtrybots() {
git commit --amend -m"$OLD_MSG" -m"CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_msan_rel_ng" git commit --amend -m"$OLD_MSG" -m"CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_msan_rel_ng"
} }
addpdfiumbug() { addotherprojectbugs() {
STEP="add pdfium bug" && STEP="add pdfium and chromiumos bugs" &&
OLD_MSG=$(git show -s --format=%B HEAD) && OLD_MSG=$(git show -s --format=%B HEAD) &&
git commit --amend -m"$OLD_MSG" -m"PDFium-Issue: pdfium:" git commit --amend -m"$OLD_MSG" -m"
PDFium-Issue: pdfium:
ChromiumOS-Issue: chromium:"
} }
checkmodules() { checkmodules() {
...@@ -55,7 +57,7 @@ commit() { ...@@ -55,7 +57,7 @@ commit() {
rolldeps "$@" && rolldeps "$@" &&
previousrev && previousrev &&
addtrybots && addtrybots &&
addpdfiumbug && addotherprojectbugs &&
checkmodules && checkmodules &&
mergeinclude ftoption.h && mergeinclude ftoption.h &&
mergeinclude ftconfig.h && mergeinclude ftconfig.h &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment