From d912f6ba083fed382a13c47aa06299e86d0b8c6b Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 1 Dec 2016 14:51:52 -0800 Subject: Make concrete stream classes private to .cpp, part 2 Fix naming to say "Stream" Review-Url: https://codereview.chromium.org/2543043002 --- xfa/fgas/crt/fgas_stream.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'xfa') diff --git a/xfa/fgas/crt/fgas_stream.cpp b/xfa/fgas/crt/fgas_stream.cpp index 73d3d0b661..485d229282 100644 --- a/xfa/fgas/crt/fgas_stream.cpp +++ b/xfa/fgas/crt/fgas_stream.cpp @@ -129,7 +129,7 @@ class CFX_BufferReadStreamImp : public IFX_StreamImp { CFX_BufferReadStreamImp(); ~CFX_BufferReadStreamImp() override; - bool LoadBufferRead(IFX_BufferRead* pBufferRead, + bool LoadBufferRead(IFX_BufferedReadStream* pBufferRead, int32_t iFileSize, uint32_t dwAccess, bool bReleaseBufferRead); @@ -151,7 +151,7 @@ class CFX_BufferReadStreamImp : public IFX_StreamImp { bool SetLength(int32_t iLength) override { return false; } private: - IFX_BufferRead* m_pBufferRead; + IFX_BufferedReadStream* m_pBufferRead; bool m_bReleaseBufferRead; int32_t m_iPosition; int32_t m_iBufferSize; @@ -200,7 +200,7 @@ class CFX_Stream : public IFX_Stream { bool LoadBuffer(uint8_t* pData, int32_t iTotalSize, uint32_t dwAccess); bool LoadFileRead(IFX_SeekableReadStream* pFileRead, uint32_t dwAccess); bool LoadFileWrite(IFX_SeekableWriteStream* pFileWrite, uint32_t dwAccess); - bool LoadBufferRead(IFX_BufferRead* pBufferRead, + bool LoadBufferRead(IFX_BufferedReadStream* pBufferRead, int32_t iFileSize, uint32_t dwAccess, bool bReleaseBufferRead); @@ -608,10 +608,11 @@ CFX_BufferReadStreamImp::~CFX_BufferReadStreamImp() { m_pBufferRead->Release(); } } -bool CFX_BufferReadStreamImp::LoadBufferRead(IFX_BufferRead* pBufferRead, - int32_t iFileSize, - uint32_t dwAccess, - bool bReleaseBufferRead) { +bool CFX_BufferReadStreamImp::LoadBufferRead( + IFX_BufferedReadStream* pBufferRead, + int32_t iFileSize, + uint32_t dwAccess, + bool bReleaseBufferRead) { ASSERT(!m_pBufferRead && pBufferRead); if (dwAccess & FX_STREAMACCESS_Write) { return false; @@ -1195,7 +1196,7 @@ bool CFX_Stream::LoadBuffer(uint8_t* pData, return true; } -bool CFX_Stream::LoadBufferRead(IFX_BufferRead* pBufferRead, +bool CFX_Stream::LoadBufferRead(IFX_BufferedReadStream* pBufferRead, int32_t iFileSize, uint32_t dwAccess, bool bReleaseBufferRead) { -- cgit v1.2.3