From a1b0772321e9b839073b9b312bac22143f2d4011 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 11 Jul 2016 08:20:58 -0700 Subject: Remove IXFA_Parser, cleanup XFA parser code. The IXFA_Parser only created a CXFA_SimpleParser, the CXFA_DocumentParser is only created in one spot and doesn't need all the IXFA_Parser methods. This CL removes IXFA_Parser, instantiates the CXFA_SimpleParser where needed and cleans up surrounding code. Review-Url: https://codereview.chromium.org/2123133004 --- xfa/fxfa/include/xfa_ffdoc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/include') diff --git a/xfa/fxfa/include/xfa_ffdoc.h b/xfa/fxfa/include/xfa_ffdoc.h index 2ea829885c..b8795bc211 100644 --- a/xfa/fxfa/include/xfa_ffdoc.h +++ b/xfa/fxfa/include/xfa_ffdoc.h @@ -38,7 +38,7 @@ class CXFA_FFDoc { FX_BOOL OpenDoc(CPDF_Document* pPDFDoc); FX_BOOL CloseDoc(); void SetDocType(uint32_t dwType); - CXFA_Document* GetXFADoc() { return m_pDocument; } + CXFA_Document* GetXFADoc() { return m_pDocumentParser->GetDocument(); } CXFA_FFApp* GetApp() { return m_pApp; } CXFA_FFDocView* GetDocView(CXFA_LayoutProcessor* pLayout); CXFA_FFDocView* GetDocView(); @@ -54,10 +54,10 @@ class CXFA_FFDoc { protected: IXFA_DocProvider* m_pDocProvider; - CXFA_Document* m_pDocument; + std::unique_ptr m_pDocumentParser; IFX_FileRead* m_pStream; CXFA_FFApp* m_pApp; - CXFA_FFNotify* m_pNotify; + std::unique_ptr m_pNotify; CPDF_Document* m_pPDFDoc; std::map m_HashToDibDpiMap; std::map> m_TypeToDocViewMap; -- cgit v1.2.3