From 857231a0723c0bf74ea6c13f1c3ce56548e23303 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 23 Apr 2018 18:34:57 +0000 Subject: Revert "Make CFX_SeekableStreamProxy a subclass of IFX_SeekableReadStream" This reverts commit c6077a0164340fa084be03eb059d608bc2675b2b. Reason for revert: Gerrit did not do what i expected. Original change's description: > Make CFX_SeekableStreamProxy a subclass of IFX_SeekableReadStream > > This CL changes CFX_SeekableStreamProxy to be an IFX_SeekableReadStream > subclass. > > Change-Id: I28ccb4771606fd6c9cc60e57297ae2e776fc5a9f > Reviewed-on: https://pdfium-review.googlesource.com/30879 > Commit-Queue: dsinclair > Reviewed-by: Tom Sepez TBR=tsepez@chromium.org,dsinclair@chromium.org,hnakashima@chromium.org Change-Id: I65e7647221e9bad2c0db7d068638178996972437 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://pdfium-review.googlesource.com/31210 Reviewed-by: dsinclair Commit-Queue: dsinclair --- core/fxcrt/cfx_seekablestreamproxy.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'core/fxcrt/cfx_seekablestreamproxy.h') diff --git a/core/fxcrt/cfx_seekablestreamproxy.h b/core/fxcrt/cfx_seekablestreamproxy.h index d389baf13f..5e0eecb87b 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.h +++ b/core/fxcrt/cfx_seekablestreamproxy.h @@ -13,7 +13,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" -class CFX_SeekableStreamProxy : public IFX_SeekableReadStream { +class CFX_SeekableStreamProxy : public Retainable { public: enum class From { Begin = 0, @@ -23,28 +23,27 @@ class CFX_SeekableStreamProxy : public IFX_SeekableReadStream { template friend RetainPtr pdfium::MakeRetain(Args&&... args); - FX_FILESIZE GetSize() override; - FX_FILESIZE GetPosition() override; - bool IsEOF() override; + FX_FILESIZE GetLength() const { return m_pStream->GetSize(); } + FX_FILESIZE GetPosition() { return m_iPosition; } + size_t GetBOMLength() const { return m_wBOMLength; } + bool IsEOF() const { return m_iPosition >= GetLength(); } - size_t ReadBlock(void* pStr, size_t size) override; - bool ReadBlock(void* pStr, FX_FILESIZE offset, size_t size) override; + void Seek(From eSeek, FX_FILESIZE iOffset); + size_t ReadString(wchar_t* pStr, size_t iMaxLength, bool* bEOS); uint16_t GetCodePage() const { return m_wCodePage; } void SetCodePage(uint16_t wCodePage); private: - explicit CFX_SeekableStreamProxy( - const RetainPtr& stream); + explicit CFX_SeekableStreamProxy(const RetainPtr& stream); ~CFX_SeekableStreamProxy() override; - void Seek(From eSeek, FX_FILESIZE iOffset); size_t ReadData(uint8_t* pBuffer, size_t iBufferSize); uint16_t m_wCodePage; size_t m_wBOMLength; FX_FILESIZE m_iPosition; - RetainPtr m_pStream; + RetainPtr m_pStream; }; #endif // CORE_FXCRT_CFX_SEEKABLESTREAMPROXY_H_ -- cgit v1.2.3