diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2018-04-12 13:40:49 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-12 13:40:49 +0000 |
commit | 62110c9ce5e0d74319e25f0f41fd241f4aeeac42 (patch) | |
tree | 7d086b5d1a2ba7b6ac0daac87f43bd1c78bbeb61 /xfa/fxfa/cxfa_ffdoc.h | |
parent | 876efaa771afe7ebd7a97dc748abdbb5b266a99b (diff) | |
download | pdfium-62110c9ce5e0d74319e25f0f41fd241f4aeeac42.tar.xz |
Cleanup CXFA_FFDoc
This CL changes CXFA_FFDoc to no longer use the CXFA_FFApp to create the
document, it does it directly. The stream data is not stored in the
FFDoc anymore as it is only used once.
Change-Id: I8247d2fb0324e554250ff0a03c67f067ef46e437
Reviewed-on: https://pdfium-review.googlesource.com/30270
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffdoc.h')
-rw-r--r-- | xfa/fxfa/cxfa_ffdoc.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h index fd90471f23..dc656253ef 100644 --- a/xfa/fxfa/cxfa_ffdoc.h +++ b/xfa/fxfa/cxfa_ffdoc.h @@ -20,6 +20,7 @@ class CFGAS_PDFFontMgr; class CFX_ChecksumContext; class CFX_DIBitmap; class CPDF_Document; +class CPDF_Object; class CXFA_FFApp; class CXFA_FFNotify; class CXFA_FFDocView; @@ -59,11 +60,9 @@ class CXFA_FFDoc { } FormType GetFormType() const { return m_FormType; } - bool Load(); CXFA_FFDocView* CreateDocView(); - bool ParseDoc(); bool OpenDoc(CPDF_Document* pPDFDoc); void CloseDoc(); @@ -83,16 +82,17 @@ class CXFA_FFDoc { bool bXDP = true); private: + bool ParseDoc(CPDF_Object* pElementXFA); + UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment; - std::unique_ptr<CFX_XMLNode> m_pXMLRoot; - std::unique_ptr<CXFA_Document> m_pDocument; - RetainPtr<IFX_SeekableStream> m_pStream; UnownedPtr<CXFA_FFApp> const m_pApp; - std::unique_ptr<CXFA_FFNotify> m_pNotify; UnownedPtr<CPDF_Document> m_pPDFDoc; - std::map<uint32_t, FX_IMAGEDIB_AND_DPI> m_HashToDibDpiMap; + std::unique_ptr<CFX_XMLNode> m_pXMLRoot; + std::unique_ptr<CXFA_FFNotify> m_pNotify; + std::unique_ptr<CXFA_Document> m_pDocument; std::unique_ptr<CXFA_FFDocView> m_DocView; std::unique_ptr<CFGAS_PDFFontMgr> m_pPDFFontMgr; + std::map<uint32_t, FX_IMAGEDIB_AND_DPI> m_HashToDibDpiMap; FormType m_FormType = FormType::kXFAForeground; }; |