diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-07-11 08:20:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-07-11 08:20:58 -0700 |
| commit | a1b0772321e9b839073b9b312bac22143f2d4011 (patch) | |
| tree | ff6d64879b0d54dd30242f77139eca7e8384343e /xfa/fxfa/include | |
| parent | d1cf239fa6be42baa02028efd1617d5af27d82e1 (diff) | |
| download | pdfium-a1b0772321e9b839073b9b312bac22143f2d4011.tar.xz | |
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
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/xfa_ffdoc.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<CXFA_DocumentParser> m_pDocumentParser; IFX_FileRead* m_pStream; CXFA_FFApp* m_pApp; - CXFA_FFNotify* m_pNotify; + std::unique_ptr<CXFA_FFNotify> m_pNotify; CPDF_Document* m_pPDFDoc; std::map<uint32_t, FX_IMAGEDIB_AND_DPI> m_HashToDibDpiMap; std::map<uint32_t, std::unique_ptr<CXFA_FFDocView>> m_TypeToDocViewMap; |