Commit 50255db8 authored by Ben Wagner's avatar Ben Wagner Committed by Commit Bot

Roll src/third_party/freetype/src/ 2c8e6279a..9789c75b1 (28 commits)

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/2c8e6279a7bf..9789c75b1a6f

$ git log 2c8e6279a..9789c75b1 --date=short --no-merges --format='%ad %ae %s'
2018-09-04 wl More '...' vs. `...` fixes in API documentation.
2018-09-04 wl Make `/****...' comments in public headers uniformly end on column 77.
2018-09-03 apodtele * docs/DEBUG: s/trace_//.
2018-09-03 ramakrishnan.nikhil [docwriter] Don't break code snippets accross lines.
2018-09-03 wl include/freettype/config:*.*: Convert comments to Markdown syntax.
2018-09-03 wl */*: s/PSNames/psnames/.
2018-09-03 wl [sfnt] Fix heap buffer overflow in CPAL handling.
2018-09-01 wl Remove `FT_Outline_{New,Done}_Internal'.
2018-08-31 apodtele * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Check glyph format.
2018-08-31 prince.cherusker [errors] Refine the macro logic surrounding `FT_Error_String'.
2018-08-31 wl Whitespace.
2018-08-31 wl * src/base/ftdebug.c (FT_Throw): Restore missing `FT_UNUSED' calls.
2018-08-31 wl * src/base/ftdebug.c (FT_Throw): Reduce chattiness.
2018-08-31 wl Minor comments.
2018-08-31 wl Whitespace.
2018-08-31 wl Add link to OpenType's composite glyph description.
2018-08-31 wl * src/autofit/afhints.c (af_glyph_hints_reload): Add initialization.
2018-08-30 apodtele Consolidate bitmap presetting and size assessment.
2018-08-30 apodtele * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Correct mono.
2018-08-30 prince.cherusker [errors] Introduce a macro to control `FT_Error_String'.
2018-08-30 prince.cherusker [errors] Introduce `FT_Error_String'.
2018-08-30 wl [autofit] Trace `before' and `after' edges of strong points.
2018-08-30 wl Minor.
2018-08-30 apodtele [base] Overflow-resistant bitmap presetting.
2018-08-29 wl Doc fix.
2018-08-29 prince.cherusker Fix numeric overflows.
2018-08-29 wl ftoption.h: s/precendence/precedence/ in documentation (#54586).
2018-08-29 wl [cff] Fix handling of `roll' op in old engine.

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

CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_chromium_msan_rel_ng

PDFium-Issue: pdfium:1145
Change-Id: I5b11c49ad02a0919ea2de1162145c73994c388d3
Reviewed-on: https://chromium-review.googlesource.com/1204272
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588800}
parent c4f8dee3
...@@ -157,7 +157,7 @@ vars = { ...@@ -157,7 +157,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': '2c8e6279a7bfc314f3934bc8d126ecb1e5e284f1', 'freetype_revision': '9789c75b1a6faf01cbcc34d85bf1bb3f473743b1',
# 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-1-204 Version: VER-2-9-1-232
Revision: 2c8e6279a7bfc314f3934bc8d126ecb1e5e284f1 Revision: 9789c75b1a6faf01cbcc34d85bf1bb3f473743b1
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
......
...@@ -6,11 +6,6 @@ rolldeps() { ...@@ -6,11 +6,6 @@ rolldeps() {
roll-dep -r "${REVIEWERS}" "$@" src/third_party/freetype/src/ roll-dep -r "${REVIEWERS}" "$@" src/third_party/freetype/src/
} }
previousrev() {
STEP="original revision" &&
PREVIOUS_FREETYPE_REV=$(git grep "'freetype_revision':" HEAD~1 -- DEPS | grep -Eho "[0-9a-fA-F]{32}")
}
addtrybots() { addtrybots() {
STEP="add trybots" && STEP="add trybots" &&
OLD_MSG=$(git show -s --format=%B HEAD) && OLD_MSG=$(git show -s --format=%B HEAD) &&
...@@ -24,13 +19,23 @@ addotherprojectbugs() { ...@@ -24,13 +19,23 @@ addotherprojectbugs() {
PDFium-Issue: pdfium:" PDFium-Issue: pdfium:"
} }
checkmodules() { updatereadme() {
STEP="check modules.cfg: check list of modules and dependencies" && STEP="update README.chromium" &&
! git -C third_party/freetype/src/ diff --name-only ${PREVIOUS_FREETYPE_REV} | grep -q modules.cfg FTVERSION=$(git -C third_party/freetype/src/ describe --long) &&
FTCOMMIT=$(git -C third_party/freetype/src/ rev-parse HEAD) &&
sed -i'' -e "s/^Version: .*\$/Version: ${FTVERSION%-*}/" third_party/freetype/README.chromium &&
sed -i'' -e "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" third_party/freetype/README.chromium &&
git add third_party/freetype/README.chromium
}
previousrev() {
STEP="original revision" &&
PREVIOUS_FREETYPE_REV=$(git grep "'freetype_revision':" HEAD~1 -- DEPS | grep -Eho "[0-9a-fA-F]{32}")
} }
mergeinclude() { mergeinclude() {
INCLUDE=$1 && INCLUDE=$1 &&
previousrev &&
STEP="merge ${INCLUDE}: check for merge conflicts" && STEP="merge ${INCLUDE}: check for merge conflicts" &&
TMPFILE=$(mktemp) && TMPFILE=$(mktemp) &&
git -C third_party/freetype/src/ cat-file blob ${PREVIOUS_FREETYPE_REV}:include/freetype/config/${INCLUDE} >> ${TMPFILE} && git -C third_party/freetype/src/ cat-file blob ${PREVIOUS_FREETYPE_REV}:include/freetype/config/${INCLUDE} >> ${TMPFILE} &&
...@@ -39,13 +44,10 @@ mergeinclude() { ...@@ -39,13 +44,10 @@ mergeinclude() {
git add third_party/freetype/include/freetype-custom-config/${INCLUDE} git add third_party/freetype/include/freetype-custom-config/${INCLUDE}
} }
updatereadme() { checkmodules() {
STEP="update README.chromium" && previousrev &&
FTVERSION=$(git -C third_party/freetype/src/ describe --long) && STEP="check modules.cfg: check list of modules and dependencies" &&
FTCOMMIT=$(git -C third_party/freetype/src/ rev-parse HEAD) && ! git -C third_party/freetype/src/ diff --name-only ${PREVIOUS_FREETYPE_REV} | grep -q modules.cfg
sed -i'' -e "s/^Version: .*\$/Version: ${FTVERSION%-*}/" third_party/freetype/README.chromium &&
sed -i'' -e "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" third_party/freetype/README.chromium &&
git add third_party/freetype/README.chromium
} }
commit() { commit() {
...@@ -54,12 +56,11 @@ commit() { ...@@ -54,12 +56,11 @@ commit() {
} }
rolldeps "$@" && rolldeps "$@" &&
previousrev &&
addtrybots && addtrybots &&
addotherprojectbugs && addotherprojectbugs &&
checkmodules && updatereadme &&
mergeinclude ftoption.h && mergeinclude ftoption.h &&
mergeinclude ftconfig.h && mergeinclude ftconfig.h &&
updatereadme && checkmodules &&
commit && commit &&
true || echo "Failed step ${STEP}" && false true || echo "Failed step ${STEP}" && false
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