From ad2441ef675866eb84c7392eeda03391a5a5d474 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 24 Oct 2016 10:19:11 -0700 Subject: Rename IFX_ stream names It's been troubling for some time that an IFX_FileStream might actually be an in-memory buffer with no backing file. Review-Url: https://codereview.chromium.org/2443723002 --- xfa/fde/xml/cfx_saxreader.cpp | 4 ++-- xfa/fde/xml/cfx_saxreader.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'xfa/fde/xml') diff --git a/xfa/fde/xml/cfx_saxreader.cpp b/xfa/fde/xml/cfx_saxreader.cpp index 187d14e98b..8f18451ea0 100644 --- a/xfa/fde/xml/cfx_saxreader.cpp +++ b/xfa/fde/xml/cfx_saxreader.cpp @@ -70,7 +70,7 @@ CFX_SAXFile::CFX_SAXFile() m_pBuf(nullptr), m_dwBufSize(0), m_dwBufIndex(0) {} -FX_BOOL CFX_SAXFile::StartFile(IFX_FileRead* pFile, +FX_BOOL CFX_SAXFile::StartFile(IFX_SeekableReadStream* pFile, uint32_t dwStart, uint32_t dwLen) { ASSERT(!m_pFile && pFile); @@ -214,7 +214,7 @@ FX_BOOL CFX_SAXReader::SkipSpace(uint8_t ch) { return (m_dwParseMode & CFX_SaxParseMode_NotSkipSpace) == 0 && ch < 0x21; } -int32_t CFX_SAXReader::StartParse(IFX_FileRead* pFile, +int32_t CFX_SAXReader::StartParse(IFX_SeekableReadStream* pFile, uint32_t dwStart, uint32_t dwLen, uint32_t dwParseMode) { diff --git a/xfa/fde/xml/cfx_saxreader.h b/xfa/fde/xml/cfx_saxreader.h index b6bedfe65c..10ba69f1f5 100644 --- a/xfa/fde/xml/cfx_saxreader.h +++ b/xfa/fde/xml/cfx_saxreader.h @@ -38,10 +38,12 @@ class CFX_SAXItem { class CFX_SAXFile { public: CFX_SAXFile(); - FX_BOOL StartFile(IFX_FileRead* pFile, uint32_t dwStart, uint32_t dwLen); + FX_BOOL StartFile(IFX_SeekableReadStream* pFile, + uint32_t dwStart, + uint32_t dwLen); FX_BOOL ReadNextBlock(); void Reset(); - IFX_FileRead* m_pFile; + IFX_SeekableReadStream* m_pFile; uint32_t m_dwStart; uint32_t m_dwEnd; uint32_t m_dwCur; @@ -70,7 +72,7 @@ class CFX_SAXReader { CFX_SAXReader(); ~CFX_SAXReader(); - int32_t StartParse(IFX_FileRead* pFile, + int32_t StartParse(IFX_SeekableReadStream* pFile, uint32_t dwStart = 0, uint32_t dwLen = -1, uint32_t dwParseMode = 0); -- cgit v1.2.3