From 2bfa222a38e12a5108899a9d9b5a9b2179dcb4c1 Mon Sep 17 00:00:00 2001 From: npm Date: Tue, 11 Oct 2016 14:50:56 -0700 Subject: Delete unused flags from CFX_SubstFont Review-Url: https://codereview.chromium.org/2409173003 --- core/fxge/ge/cfx_renderdevice.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'core/fxge/ge/cfx_renderdevice.cpp') 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; } } -- cgit v1.2.3