diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-18 11:55:27 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-18 19:33:58 +0000 |
| commit | 4fcdf058734b5df696420aa653ea787842678224 (patch) | |
| tree | 6f0c4bf5ed7917fecf6c6deeb741b31ae4de68e3 /xfa/fxfa/cxfa_ffdoc.cpp | |
| parent | 1d52d1e5fb0b14782dd6b97eeee8c90106839452 (diff) | |
| download | pdfium-4fcdf058734b5df696420aa653ea787842678224.tar.xz | |
Subclass the stream implementations from CFGAS_Stream
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 <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffdoc.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffdoc.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/xfa/fxfa/cxfa_ffdoc.cpp b/xfa/fxfa/cxfa_ffdoc.cpp index 2bbdfa1b9c..3565370bde 100644 --- a/xfa/fxfa/cxfa_ffdoc.cpp +++ b/xfa/fxfa/cxfa_ffdoc.cpp @@ -281,7 +281,7 @@ CXFA_FFDocView* CXFA_FFDoc::GetDocView() { return m_DocView.get(); } -bool CXFA_FFDoc::OpenDoc(const CFX_RetainPtr<IFX_SeekableReadStream>& pStream) { +bool CXFA_FFDoc::OpenDoc(const CFX_RetainPtr<IFX_SeekableStream>& pStream) { m_pStream = pStream; return true; } @@ -389,9 +389,8 @@ CFX_RetainPtr<CFX_DIBitmap> CXFA_FFDoc::GetPDFNamedImage( auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); pAcc->LoadAllData(); - CFX_RetainPtr<IFX_SeekableReadStream> pImageFileRead = - IFX_MemoryStream::Create(const_cast<uint8_t*>(pAcc->GetData()), - pAcc->GetSize()); + CFX_RetainPtr<IFX_SeekableStream> pImageFileRead = IFX_MemoryStream::Create( + const_cast<uint8_t*>(pAcc->GetData()), pAcc->GetSize()); CFX_RetainPtr<CFX_DIBitmap> pDibSource = XFA_LoadImageFromBuffer( pImageFileRead, FXCODEC_IMAGE_UNKNOWN, iImageXDpi, iImageYDpi); @@ -399,10 +398,9 @@ CFX_RetainPtr<CFX_DIBitmap> CXFA_FFDoc::GetPDFNamedImage( return pDibSource; } -bool CXFA_FFDoc::SavePackage( - XFA_HashCode code, - const CFX_RetainPtr<IFX_SeekableWriteStream>& pFile, - CFX_ChecksumContext* pCSContext) { +bool CXFA_FFDoc::SavePackage(XFA_HashCode code, + const CFX_RetainPtr<IFX_SeekableStream>& pFile, + CFX_ChecksumContext* pCSContext) { CXFA_Document* doc = m_pDocumentParser->GetDocument(); auto pExport = pdfium::MakeUnique<CXFA_DataExporter>(doc); CXFA_Node* pNode = code == XFA_HASHCODE_Xfa ? doc->GetRoot() @@ -418,9 +416,8 @@ bool CXFA_FFDoc::SavePackage( pFile, pNode, 0, bsChecksum.GetLength() ? bsChecksum.c_str() : nullptr); } -bool CXFA_FFDoc::ImportData( - const CFX_RetainPtr<IFX_SeekableReadStream>& pStream, - bool bXDP) { +bool CXFA_FFDoc::ImportData(const CFX_RetainPtr<IFX_SeekableStream>& pStream, + bool bXDP) { auto importer = pdfium::MakeUnique<CXFA_DataImporter>(m_pDocumentParser->GetDocument()); return importer->ImportData(pStream); |