diff options
| author | thakis <thakis@chromium.org> | 2015-12-31 09:26:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-31 17:26:58 +0000 |
| commit | 29de2c811de5e5fa6eb238bbcd45796907c037bd (patch) | |
| tree | ac1ea9902b9958b3af28eda50a4301bf56c3ecf5 /third_party/harfbuzz-ng | |
| parent | 92469c8c4b7da052273dee1a31308663d1dd1e3d (diff) | |
| download | chromium_src-29de2c811de5e5fa6eb238bbcd45796907c037bd.zip chromium_src-29de2c811de5e5fa6eb238bbcd45796907c037bd.tar.gz chromium_src-29de2c811de5e5fa6eb238bbcd45796907c037bd.tar.bz2 | |
Prepare for -Wall for third-party code, -Wextra for chromium_code
This lands patch set 16 of https://codereview.chromium.org/1551753002/
(reviewed there), except for the changes to build/common.gypi and
build/config/compiler/BUILD.gn. The changes to these two files are likely
to break some bot I don't know about, and I don't want to keep reverting
and relanding all these files. So this lands the parts that are hopefully
harmless separately.
BUG=573250
TBR=thestig
Review URL: https://codereview.chromium.org/1557733002
Cr-Commit-Position: refs/heads/master@{#367252}
Diffstat (limited to 'third_party/harfbuzz-ng')
| -rw-r--r-- | third_party/harfbuzz-ng/README.chromium | 4 | ||||
| -rw-r--r-- | third_party/harfbuzz-ng/src/hb-coretext.cc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/third_party/harfbuzz-ng/README.chromium b/third_party/harfbuzz-ng/README.chromium index 1484e11..107d359 100644 --- a/third_party/harfbuzz-ng/README.chromium +++ b/third_party/harfbuzz-ng/README.chromium @@ -18,3 +18,7 @@ tarball's src folder over to src, then checking for removed or added files and update our build recipes in BUILD.gn and harfbuzz.gyp accordingly, update the NEWS file from HarfBuzz' release notes, and bump the version numbers in README.chromium. + +Local changes: +* merge https://github.com/behdad/harfbuzz/pull/203 +* merge https://github.com/behdad/harfbuzz/pull/206 diff --git a/third_party/harfbuzz-ng/src/hb-coretext.cc b/third_party/harfbuzz-ng/src/hb-coretext.cc index 13ba5d9..316d281 100644 --- a/third_party/harfbuzz-ng/src/hb-coretext.cc +++ b/third_party/harfbuzz-ng/src/hb-coretext.cc @@ -693,7 +693,6 @@ resize_and_retry: scratch += old_scratch_used; scratch_size -= old_scratch_used; } -retry: { string_ref = CFStringCreateWithCharactersNoCopy (NULL, pchars, chars_len, @@ -1129,10 +1128,6 @@ fail: * AAT shaper */ -HB_SHAPER_DATA_ENSURE_DECLARE(coretext_aat, face) -HB_SHAPER_DATA_ENSURE_DECLARE(coretext_aat, font) - - /* * shaper face data */ |