diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-26 12:02:16 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-26 17:30:44 +0000 |
| commit | 81f02f4c8347890ce66d6ec48781589d10098689 (patch) | |
| tree | 6e085c69e5a5addf964014fb63b42d1d8c7a36fa /xfa/fxfa/cxfa_ffapp.cpp | |
| parent | 15dffdf6bd8d595193cfb072974a8efeb8052a91 (diff) | |
| download | pdfium-81f02f4c8347890ce66d6ec48781589d10098689.tar.xz | |
Move font source into CFGAS_FontMgr
This CL moves the font source into the font manager so it doesn't need
to be stored by each caller (and removes the platform dependant code).
The |EnumFonts| method is exposed on the CFGAS_FontMgr so the caller can
clear the manager if the enumeration fails.
Change-Id: Iecce3d2e09ff01152b7bb79a34fe2b728320da9c
Reviewed-on: https://pdfium-review.googlesource.com/14816
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffapp.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffapp.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp index 8ec23e19c4..e3ca42c129 100644 --- a/xfa/fxfa/cxfa_ffapp.cpp +++ b/xfa/fxfa/cxfa_ffapp.cpp @@ -62,12 +62,9 @@ CXFA_FontMgr* CXFA_FFApp::GetXFAFontMgr() const { CFGAS_FontMgr* CXFA_FFApp::GetFDEFontMgr() { if (!m_pFDEFontMgr) { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - m_pFDEFontMgr = CFGAS_FontMgr::Create(FX_GetDefFontEnumerator()); -#else - m_pFontSource = pdfium::MakeUnique<CFX_FontSourceEnum_File>(); - m_pFDEFontMgr = CFGAS_FontMgr::Create(m_pFontSource.get()); -#endif + m_pFDEFontMgr = pdfium::MakeUnique<CFGAS_FontMgr>(); + if (!m_pFDEFontMgr->EnumFonts()) + m_pFDEFontMgr = nullptr; } return m_pFDEFontMgr.get(); } |