diff options
| author | dominik.rottsches@intel.com <dominik.rottsches@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-16 06:00:04 +0000 |
|---|---|---|
| committer | dominik.rottsches@intel.com <dominik.rottsches@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-16 06:01:40 +0000 |
| commit | 00d186051a0998ad002524102cf2931e218fa276 (patch) | |
| tree | f65f6b7ea0fbee953648872741a62d0e0c7bb8ab /third_party/harfbuzz-ng/src/hb-ot-layout-private.hh | |
| parent | a0f7e388795ba0c860e8262fa967c9aefdb747aa (diff) | |
| download | chromium_src-00d186051a0998ad002524102cf2931e218fa276.zip chromium_src-00d186051a0998ad002524102cf2931e218fa276.tar.gz chromium_src-00d186051a0998ad002524102cf2931e218fa276.tar.bz2 | |
Roll HarfBuzz to 0.9.35
0.9.35 contains a couple of fixes for the CoreText shaper
backend, which are required to work on removing the CoreText
codepaths in Blink.
Review URL: https://codereview.chromium.org/475363002
Cr-Commit-Position: refs/heads/master@{#290100}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/harfbuzz-ng/src/hb-ot-layout-private.hh')
| -rw-r--r-- | third_party/harfbuzz-ng/src/hb-ot-layout-private.hh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh b/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh index 9b06300..ae7daa6 100644 --- a/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh +++ b/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh @@ -127,7 +127,7 @@ struct hb_ot_layout_lookup_accelerator_t } template <typename TLookup> - inline void fini (const TLookup &lookup) + inline void fini (const TLookup &lookup HB_UNUSED) { } @@ -420,6 +420,13 @@ _hb_buffer_deallocate_unicode_vars (hb_buffer_t *buffer) } static inline void +_hb_buffer_assert_unicode_vars (hb_buffer_t *buffer) +{ + HB_BUFFER_ASSERT_VAR (buffer, unicode_props0); + HB_BUFFER_ASSERT_VAR (buffer, unicode_props1); +} + +static inline void _hb_buffer_allocate_gsubgpos_vars (hb_buffer_t *buffer) { HB_BUFFER_ALLOCATE_VAR (buffer, glyph_props); @@ -435,6 +442,14 @@ _hb_buffer_deallocate_gsubgpos_vars (hb_buffer_t *buffer) HB_BUFFER_DEALLOCATE_VAR (buffer, glyph_props); } +static inline void +_hb_buffer_assert_gsubgpos_vars (hb_buffer_t *buffer) +{ + HB_BUFFER_ASSERT_VAR (buffer, glyph_props); + HB_BUFFER_ASSERT_VAR (buffer, lig_props); + HB_BUFFER_ASSERT_VAR (buffer, syllable); +} + /* Make sure no one directly touches our props... */ #undef unicode_props0 #undef unicode_props1 |