diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 10:13:40 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 19:30:30 +0000 |
| commit | 959c2bebde7f46b194f0f83ba5626cb982213638 (patch) | |
| tree | dc805193c73007f3a409b35e50bdc6ea0d306ef9 /xfa/fxfa/cxfa_fontmgr.h | |
| parent | de44d154f6c61af75f149e965a7f483f0b30dd98 (diff) | |
| download | pdfium-959c2bebde7f46b194f0f83ba5626cb982213638.tar.xz | |
Rename CXFA_DefFontMgr to CFGAS_DefaultFontManager
This CL removes any XFA requirements on the default font manager and
moves it to the fgas/ directory. Some helper methods from CXFA_FontMgr
are moved into the fgas/fgas_fontutils.h files.
Change-Id: I17ba8dc2bd60085c17d8a3328f6625675a82787f
Reviewed-on: https://pdfium-review.googlesource.com/14570
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fontmgr.h')
| -rw-r--r-- | xfa/fxfa/cxfa_fontmgr.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/xfa/fxfa/cxfa_fontmgr.h b/xfa/fxfa/cxfa_fontmgr.h index 2e335622c6..988964dab2 100644 --- a/xfa/fxfa/cxfa_fontmgr.h +++ b/xfa/fxfa/cxfa_fontmgr.h @@ -14,24 +14,13 @@ #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_system.h" +#include "xfa/fgas/font/cfgas_defaultfontmanager.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" -#include "xfa/fxfa/cxfa_deffontmgr.h" #include "xfa/fxfa/fxfa.h" class CPDF_Font; -struct XFA_FONTINFO { - uint32_t dwFontNameHash; - const wchar_t* pPsName; - const wchar_t* pReplaceFont; - uint16_t dwStyles; - uint16_t wCodePage; -}; - -WideString XFA_LocalFontNameToEnglishName(const WideStringView& wsLocalName); -const XFA_FONTINFO* XFA_GetFontINFOByFontName(const WideStringView& wsFontName); - class CXFA_FontMgr { public: CXFA_FontMgr(); @@ -43,10 +32,10 @@ class CXFA_FontMgr { uint16_t wCodePage = 0xFFFF); void LoadDocFonts(CXFA_FFDoc* hDoc); void ReleaseDocFonts(CXFA_FFDoc* hDoc); - void SetDefFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr); + void SetDefFontMgr(std::unique_ptr<CFGAS_DefaultFontManager> pFontMgr); private: - std::unique_ptr<CXFA_DefFontMgr> m_pDefFontMgr; + std::unique_ptr<CFGAS_DefaultFontManager> m_pDefFontMgr; std::map<CXFA_FFDoc*, std::unique_ptr<CFGAS_PDFFontMgr>> m_PDFFontMgrMap; std::map<ByteString, CFX_RetainPtr<CFGAS_GEFont>> m_FontMap; }; |