diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 09:46:03 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 18:34:29 +0000 |
| commit | db0312e6acd7cc15fef0f64e05bd463cb74c70e4 (patch) | |
| tree | 6ffb772e0f29f65c414adaeececc0c8e3047805d /xfa/fxfa/cxfa_fontmgr.h | |
| parent | 46fc3fa47dc5c863519c5c3d834319b80bf5ff4a (diff) | |
| download | pdfium-db0312e6acd7cc15fef0f64e05bd463cb74c70e4.tar.xz | |
Move CXFA_PDFFontMgr to CFGAS_PDFFontMgr
XFA bits passed into the PDFFontMgr are just used to get the
CPDF_Document and the CFGAS_FontMgr. This CL changes the code to pass
those two things into the constructor. Then, the fxfa/cxfa_pdffontmgr.*
code has been moved to fgas/cfgas_pdffontmgr.* to show it doesn't depend
on any of the XFA classes.
Change-Id: I21d791869e2a32ffedfd7c87bb3bbd035232d991
Reviewed-on: https://pdfium-review.googlesource.com/14550
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fontmgr.h')
| -rw-r--r-- | xfa/fxfa/cxfa_fontmgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/cxfa_fontmgr.h b/xfa/fxfa/cxfa_fontmgr.h index e5db565147..2e335622c6 100644 --- a/xfa/fxfa/cxfa_fontmgr.h +++ b/xfa/fxfa/cxfa_fontmgr.h @@ -15,8 +15,8 @@ #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_system.h" #include "xfa/fgas/font/cfgas_fontmgr.h" +#include "xfa/fgas/font/cfgas_pdffontmgr.h" #include "xfa/fxfa/cxfa_deffontmgr.h" -#include "xfa/fxfa/cxfa_pdffontmgr.h" #include "xfa/fxfa/fxfa.h" class CPDF_Font; @@ -47,7 +47,7 @@ class CXFA_FontMgr { private: std::unique_ptr<CXFA_DefFontMgr> m_pDefFontMgr; - std::map<CXFA_FFDoc*, std::unique_ptr<CXFA_PDFFontMgr>> m_PDFFontMgrMap; + std::map<CXFA_FFDoc*, std::unique_ptr<CFGAS_PDFFontMgr>> m_PDFFontMgrMap; std::map<ByteString, CFX_RetainPtr<CFGAS_GEFont>> m_FontMap; }; |