From 9972ff99285cea12a20026136e98c1e635a15010 Mon Sep 17 00:00:00 2001 From: art-snake Date: Tue, 20 Sep 2016 07:46:25 -0700 Subject: Refactor CFX_FontCache to have only one in GE Module. After this CL: only one global CFX_FontCache used. Any cached items from it, are released, when they are not being used. This is restore part of reverted CL: Original CL: https://codereview.chromium.org/2158023002 Revert reason: BUG=647612 Fix bug CL: https://codereview.chromium.org/2350193003 Review-Url: https://codereview.chromium.org/2350243002 --- xfa/fxgraphics/cfx_graphics.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fxgraphics') diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index 068ed015f4..b9f8287ae4 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp @@ -1294,9 +1294,8 @@ FWL_Error CFX_Graphics::RenderDeviceShowText(const CFX_PointF& point, m.Concat(*matrix); } FX_BOOL result = m_renderDevice->DrawNormalText( - length, charPos, m_info.font, CFX_GEModule::Get()->GetFontCache(), - -m_info.fontSize * m_info.fontHScale, &m, m_info.fillColor->m_info.argb, - FXTEXT_CLEARTYPE); + length, charPos, m_info.font, -m_info.fontSize * m_info.fontHScale, &m, + m_info.fillColor->m_info.argb, FXTEXT_CLEARTYPE); if (!result) return FWL_Error::Indefinite; FX_Free(charPos); -- cgit v1.2.3