Commit 7587ec24 authored by Dominik Röttsches's avatar Dominik Röttsches Committed by Commit Bot

Roll src/third_party/harfbuzz-ng/src/ 60485ab04..bbad1b829 (27 commits)

Synchronize with HarfBuzz' removal of the back-conversion/multiplication
from "ptem" to "CoreText points", in other words, synchronize with a
change in HarfBuzz in how the unit of hb_font_set_ptem is
interpreted. More details in [1].

https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/60485ab04736..bbad1b829812

$ git log 60485ab04..bbad1b829 --date=short --no-merges --format='%ad %ae %s'
2019-08-20 ebrahim [trak] minor, use roundf instead round to normalize the use
2019-08-20 ebrahim [readme] add oss-fuzz badge
2019-08-20 ebrahim [test] Rebase 10.14 trak related test
2019-08-19 behdad Minor touch-up for recent change
2019-08-07 ebrahim [avar] Implement inverse map, unmap
2019-08-07 ebrahim [fvar] Implement inverse normalize, unnormalize
2019-08-19 behdad Minor
2019-08-18 ebrahim Remove continuous development helper script
2019-08-16 khaledhosny [ot-shape] Keep horizontal_features array sorted
2019-08-16 khaledhosny [ot-shape] Enable abvm/blwm features by default
2019-08-16 khaledhosny [ot-shape] Enable dist feature by default (#1908)
2019-08-14 ebrahim Move HB_NO_VAR to a better place in hb-font.cc
2019-08-14 ebrahim minor
2019-08-14 ebrahim Minor, remove trailing spaces in hb-font.{cc,h} as .editorconfig
2019-08-14 ebrahim Fix caret_count value when AAT is disabled
2019-08-14 ebrahim [lcar] Use multiformat convention
2019-08-14 ebrahim [opbd] Use multiformat convention on the table
2019-08-14 ebrahim [opbd] Turn OpticalBounds fields to FWORD
2019-08-13 behdad 2.6.0
2019-08-13 behdad Rename hb_ot_meta_get_entries() to +hb_ot_meta_get_entry_tags()
2019-08-13 behdad [pool] Fix alignment assertion
2019-08-11 ebrahim Increase subset fuzzer timeout to 16s
2019-08-11 ebrahim [ci] Disable vcpkg thus running the test suit in Windows
2019-08-11 ebrahim Implement opbd table parsing
2019-08-10 ebrahim [os2] Replace null pool addr compare by checking vital fields (#1896)
2019-08-07 ebrahim [fvar] Use roundf instead hardcoding round logic
2018-12-17 tor.arne.vestbo Remove assumption about Core Text working in 96 DPI

[1] https://github.com/harfbuzz/harfbuzz/pull/1484

Created with:
  roll-dep src/third_party/harfbuzz-ng/src
R=bashi@chromium.org,behdad@chromium.org,bungeman@chromium.org,drott@chromium.org,eae@chromium.org,jshin@chromium.org

Bug: 995721
Change-Id: I1eea18a1f1e4e3bad86fede7291f4acf0b4bef71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761282
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Auto-Submit: Dominik Röttsches <drott@chromium.org>
Reviewed-by: default avatarEmil A Eklund <eae@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688504}
parent 18f1f26a
...@@ -200,7 +200,7 @@ vars = { ...@@ -200,7 +200,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 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.
'harfbuzz_revision': '60485ab0473630c585bb96fcdc14dbe415edf4f2', 'harfbuzz_revision': 'bbad1b8298125d78c159ed7fdd7bde6a3f3fff56',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Emoji Segmenter # the commit queue can handle CLs rolling Emoji Segmenter
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -415,7 +415,13 @@ hb_font_t* HarfBuzzFace::GetScaledFont( ...@@ -415,7 +415,13 @@ hb_font_t* HarfBuzzFace::GetScaledFont(
int scale = SkiaScalarToHarfBuzzPosition(platform_data_->size()); int scale = SkiaScalarToHarfBuzzPosition(platform_data_->size());
hb_font_set_scale(unscaled_font_, scale, scale); hb_font_set_scale(unscaled_font_, scale, scale);
hb_font_set_ptem(unscaled_font_, platform_data_->size() / kCssPixelsPerPoint); // See contended discussion in https://github.com/harfbuzz/harfbuzz/pull/1484
// Setting ptem here is critical for HarfBuzz to know where to lookup spacing
// offset in the AAT trak table, the unit pt in ptem here means "CoreText"
// points. After discussion on the pull request and with Apple developers, the
// meaning of HarfBuzz' hb_font_set_ptem API was changed to expect the
// equivalent of CSS pixels here.
hb_font_set_ptem(unscaled_font_, platform_data_->size());
SkTypeface* typeface = harfbuzz_font_data_->font_.getTypeface(); SkTypeface* typeface = harfbuzz_font_data_->font_.getTypeface();
int axis_count = typeface->getVariationDesignPosition(nullptr, 0); int axis_count = typeface->getVariationDesignPosition(nullptr, 0);
......
Name: harfbuzz-ng Name: harfbuzz-ng
Short Name: harfbuzz-ng Short Name: harfbuzz-ng
URL: http://harfbuzz.org URL: http://harfbuzz.org
Version: 2.5.3-155 Version: 2.6.0-21
Date: 20190809 Date: 20190820
Revision: 60485ab0473630c585bb96fcdc14dbe415edf4f2 Revision: bbad1b8298125d78c159ed7fdd7bde6a3f3fff56
Security Critical: yes Security Critical: yes
License: MIT License: MIT
License File: src/COPYING License File: src/COPYING
......
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