From 4fcdf058734b5df696420aa653ea787842678224 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 18 Apr 2017 11:55:27 -0400 Subject: Subclass the stream implementations from CFGAS_Stream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename CFGAS_TextStream to CFGAS_Stream. CFGAS_Stream is converted to a base class instead of accepting an IFGAS_StreamImp. Things which inherted from IFGAS_StreamImp now inherit from CFGAS_Stream. The stream type inputs are changed to IFX_SeekableStream so that they can accept the same type (IFX_SeekableStream is an IFX_SeekableWriteStream and an IFX_SeekableReadStream). This way the storage can be shared in the base class. Change-Id: I06645071e68e2a4d4120c0e336529f2c18c2b705 Reviewed-on: https://pdfium-review.googlesource.com/4152 Commit-Queue: dsinclair Reviewed-by: Nicolás Peña --- xfa/fxfa/cxfa_ffdoc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_ffdoc.h') diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h index 0bba956f14..c5822e3577 100644 --- a/xfa/fxfa/cxfa_ffdoc.h +++ b/xfa/fxfa/cxfa_ffdoc.h @@ -58,7 +58,7 @@ class CXFA_FFDoc { CXFA_FFDocView* CreateDocView(); - bool OpenDoc(const CFX_RetainPtr& pStream); + bool OpenDoc(const CFX_RetainPtr& pStream); bool OpenDoc(CPDF_Document* pPDFDoc); bool CloseDoc(); @@ -72,15 +72,15 @@ class CXFA_FFDoc { int32_t& iImageYDpi); bool SavePackage(XFA_HashCode code, - const CFX_RetainPtr& pFile, + const CFX_RetainPtr& pFile, CFX_ChecksumContext* pCSContext); - bool ImportData(const CFX_RetainPtr& pStream, + bool ImportData(const CFX_RetainPtr& pStream, bool bXDP = true); private: IXFA_DocEnvironment* const m_pDocEnvironment; std::unique_ptr m_pDocumentParser; - CFX_RetainPtr m_pStream; + CFX_RetainPtr m_pStream; CXFA_FFApp* m_pApp; std::unique_ptr m_pNotify; CPDF_Document* m_pPDFDoc; -- cgit v1.2.3