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 /fpdfsdk | |
| 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 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfxfa/DEPS | 1 | ||||
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_context.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fpdfsdk/fpdfxfa/DEPS b/fpdfsdk/fpdfxfa/DEPS index b437883ba9..5ba75f2f2b 100644 --- a/fpdfsdk/fpdfxfa/DEPS +++ b/fpdfsdk/fpdfxfa/DEPS @@ -1,4 +1,5 @@ include_rules = [ '+fxjs', '+fxbarcode', + '+xfa/fgas/font', ] diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp index 8779c44186..b7dd33fa32 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp @@ -21,7 +21,7 @@ #include "public/fpdf_formfill.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" -#include "xfa/fxfa/cxfa_deffontmgr.h" +#include "xfa/fgas/font/cfgas_defaultfontmanager.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/cxfa_ffapp.h" #include "xfa/fxfa/cxfa_ffdoc.h" @@ -44,7 +44,7 @@ CPDFXFA_Context::CPDFXFA_Context(std::unique_ptr<CPDF_Document> pPDFDoc) m_nPageCount(0), m_DocEnv(this) { m_pXFAApp = pdfium::MakeUnique<CXFA_FFApp>(this); - m_pXFAApp->SetDefaultFontMgr(pdfium::MakeUnique<CXFA_DefFontMgr>()); + m_pXFAApp->SetDefaultFontMgr(pdfium::MakeUnique<CFGAS_DefaultFontManager>()); } CPDFXFA_Context::~CPDFXFA_Context() { |