From 5bba2b63759940ab2ac134bf376310e72b7adf47 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 11 Jun 2015 15:24:26 -0700 Subject: Merge to XFA: Correct unexpected hinting fonts If the font is 'tricky', it needs to be hinted by default according to the description in freetype. BUG=490814 TBR=jun_fang@foxitsoftware.com Original Review URL: https://codereview.chromium.org/1170313003. Review URL: https://codereview.chromium.org/1175243008. --- DEPS | 2 +- core/src/fxge/ge/fx_ge_text.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 59e39a4da3..af90a67ef4 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ deps = { "https://chromium.googlesource.com/chromium/buildtools.git@46ce8cb60364e9e0b21a81136c7debdddfd063a8", "testing/corpus": - "https://pdfium.googlesource.com/pdfium_tests@73e1d0c915fe574a470fcbc76dd36246ac9fec45", + "https://pdfium.googlesource.com/pdfium_tests@4b9a1d593e5a101d034a4f1195174a22c179a42d", "testing/gmock": "https://chromium.googlesource.com/external/googlemock.git@29763965ab52f24565299976b936d1265cb6a271", diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 7133d65417..3a98154060 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -1638,7 +1638,10 @@ CFX_PathData* CFX_Font::LoadGlyphPath(FX_DWORD glyph_index, int dest_width) } } FXFT_Set_Transform(m_Face, &ft_matrix, 0); - int load_flags = (m_Face->face_flags & FT_FACE_FLAG_SFNT) ? FXFT_LOAD_NO_BITMAP : FXFT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING; + int load_flags = FXFT_LOAD_NO_BITMAP; + if (!(m_Face->face_flags & FT_FACE_FLAG_SFNT) || !FT_IS_TRICKY(m_Face)) { + load_flags |= FT_LOAD_NO_HINTING; + } int error = FXFT_Load_Glyph(m_Face, glyph_index, load_flags); if (error) { return NULL; -- cgit v1.2.3