From 122ee21e38a15554c8c61edd21fda8c110be6072 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 21 Oct 2015 17:07:24 -0700 Subject: Merge to XFA: Make CFX_FontMgr member variables private. (try 2) R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1412733011 . (cherry picked from commit 5a5b6fb3759daf1201ffc9702f626f4b243922d0) Review URL: https://codereview.chromium.org/1414463006 . --- fpdfsdk/src/fsdk_mgr.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 63ed642367..b7de36c7d3 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -146,20 +146,22 @@ FX_BOOL CFX_SystemHandler::FindNativeTrueTypeFont( int32_t nCharset, CFX_ByteString sFontFaceName) { CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr(); - if (pFontMgr) { - CFX_FontMapper* pFontMapper = pFontMgr->m_pBuiltinMapper; - if (pFontMapper) { - int nSize = pFontMapper->m_InstalledTTFonts.GetSize(); - if (nSize == 0) { - pFontMapper->LoadInstalledFonts(); - nSize = pFontMapper->m_InstalledTTFonts.GetSize(); - } + if (!pFontMgr) + return FALSE; - for (int i = 0; i < nSize; i++) { - if (pFontMapper->m_InstalledTTFonts[i].Compare(sFontFaceName)) - return TRUE; - } - } + CFX_FontMapper* pFontMapper = pFontMgr->GetBuiltinMapper(); + if (!pFontMapper) + return FALSE; + + int nSize = pFontMapper->m_InstalledTTFonts.GetSize(); + if (nSize == 0) { + pFontMapper->LoadInstalledFonts(); + nSize = pFontMapper->m_InstalledTTFonts.GetSize(); + } + + for (int i = 0; i < nSize; ++i) { + if (pFontMapper->m_InstalledTTFonts[i].Compare(sFontFaceName)) + return TRUE; } return FALSE; -- cgit v1.2.3