diff options
| author | npm <npm@chromium.org> | 2016-10-11 14:50:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-11 14:50:56 -0700 |
| commit | 2bfa222a38e12a5108899a9d9b5a9b2179dcb4c1 (patch) | |
| tree | 954a22f3490d787452f6ffc7562270534900e3dd /core/fxge | |
| parent | 709f5a9301e91365ab87610993c497e386504ead (diff) | |
| download | pdfium-2bfa222a38e12a5108899a9d9b5a9b2179dcb4c1.tar.xz | |
Delete unused flags from CFX_SubstFontchromium/2888
Review-Url: https://codereview.chromium.org/2409173003
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/cfx_substfont.h | 4 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_fontmapper.cpp | 1 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_renderdevice.cpp | 7 |
3 files changed, 2 insertions, 10 deletions
diff --git a/core/fxge/cfx_substfont.h b/core/fxge/cfx_substfont.h index 8dba1006c0..01196d442a 100644 --- a/core/fxge/cfx_substfont.h +++ b/core/fxge/cfx_substfont.h @@ -10,10 +10,6 @@ #include "core/fxcrt/fx_string.h" #define FXFONT_SUBST_MM 0x01 -#define FXFONT_SUBST_GLYPHPATH 0x04 -#define FXFONT_SUBST_CLEARTYPE 0x08 -#define FXFONT_SUBST_TRANSFORM 0x10 -#define FXFONT_SUBST_NONSYMBOL 0x20 #define FXFONT_SUBST_EXACT 0x40 class CFX_SubstFont { diff --git a/core/fxge/ge/cfx_fontmapper.cpp b/core/fxge/ge/cfx_fontmapper.cpp index e59fbe1ba8..db40bdbfc7 100644 --- a/core/fxge/ge/cfx_fontmapper.cpp +++ b/core/fxge/ge/cfx_fontmapper.cpp @@ -645,7 +645,6 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name, PitchFamily); } #endif - pSubstFont->m_SubstFlags |= FXFONT_SUBST_NONSYMBOL; return FindSubstFont(family, bTrueType, flags & ~FXFONT_SYMBOLIC, weight, italic_angle, 0, pSubstFont); } diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp index d11f2e1582..0ee99947a4 100644 --- a/core/fxge/ge/cfx_renderdevice.cpp +++ b/core/fxge/ge/cfx_renderdevice.cpp @@ -854,8 +854,7 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, if (FXSYS_fabs(char2device.a) + FXSYS_fabs(char2device.b) > 50 * 1.0f || ((m_DeviceClass == FXDC_PRINTER) && !(text_flags & FXTEXT_PRINTIMAGETEXT))) { - if (pFont->GetFace() || - (pFont->GetSubstFont()->m_SubstFlags & FXFONT_SUBST_GLYPHPATH)) { + if (pFont->GetFace()) { int nPathFlags = (text_flags & FXTEXT_NOSMOOTH) == 0 ? 0 : FXFILL_NOPATHSMOOTH; return DrawTextPath(nChars, pCharPos, pFont, font_size, pText2Device, @@ -882,10 +881,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, anti_alias = FXFT_RENDER_MODE_LCD; bool bClearType = false; - if (pFont->GetFace() || - (pFont->GetSubstFont()->m_SubstFlags & FXFONT_SUBST_CLEARTYPE)) { + if (pFont->GetFace()) bClearType = !!(text_flags & FXTEXT_CLEARTYPE); - } bNormal = !bClearType; } } |