From a939bfe3e102bfb28b4e8a5d951333d16badf80b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 22 Sep 2016 13:18:45 -0700 Subject: Make creation of CPDFSDK_Document clearer Move the creation of the CPDFSDK_Document into FPDFDOC_InitFormFillEnvironment instead of hidden inside a Get method in CDPFXFA_Document. Review-Url: https://codereview.chromium.org/2353303004 --- fpdfsdk/cpdfsdk_environment.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/cpdfsdk_environment.cpp') diff --git a/fpdfsdk/cpdfsdk_environment.cpp b/fpdfsdk/cpdfsdk_environment.cpp index 2d80240366..b17b782367 100644 --- a/fpdfsdk/cpdfsdk_environment.cpp +++ b/fpdfsdk/cpdfsdk_environment.cpp @@ -8,6 +8,7 @@ #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" +#include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/fsdk_actionhandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" @@ -28,9 +29,10 @@ FPDF_WIDESTRING AsFPDFWideString(CFX_ByteString* bsUTF16LE) { CPDFSDK_Environment::CPDFSDK_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo) - : m_pInfo(pFFinfo), m_pSDKDoc(nullptr), m_pUnderlyingDoc(pDoc) { - m_pSysHandler.reset(new CFX_SystemHandler(this)); -} + : m_pInfo(pFFinfo), + m_pSDKDoc(new CPDFSDK_Document(pDoc, this)), + m_pUnderlyingDoc(pDoc), + m_pSysHandler(new CFX_SystemHandler(this)) {} CPDFSDK_Environment::~CPDFSDK_Environment() { #ifdef PDF_ENABLE_XFA -- cgit v1.2.3