From db0312e6acd7cc15fef0f64e05bd463cb74c70e4 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 09:46:03 -0400 Subject: 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 Reviewed-by: Henrique Nakashima Reviewed-by: Tom Sepez --- xfa/fxfa/cxfa_fontmgr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/cxfa_fontmgr.h') 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 m_pDefFontMgr; - std::map> m_PDFFontMgrMap; + std::map> m_PDFFontMgrMap; std::map> m_FontMap; }; -- cgit v1.2.3