summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-10-20 16:56:03 -0700
committerLei Zhang <thestig@chromium.org>2015-10-20 16:56:03 -0700
commit5a5b6fb3759daf1201ffc9702f626f4b243922d0 (patch)
tree1cc5b61a6f22b30d0d891912d4101f293635a751 /fpdfsdk/src
parent0223be82e0afcfee7c501ad2754230353bff79ff (diff)
downloadpdfium-5a5b6fb3759daf1201ffc9702f626f4b243922d0.tar.xz
Make CFX_FontMgr member variables private. (try 2)
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1412733011 .
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 4cf05a2d79..fccfbe9aa2 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -145,20 +145,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;