summaryrefslogtreecommitdiff
path: root/core/fxcrt/xml_int.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-12-01 14:51:52 -0800
committerCommit bot <commit-bot@chromium.org>2016-12-01 14:51:52 -0800
commitd912f6ba083fed382a13c47aa06299e86d0b8c6b (patch)
treeab99a7b69358e98905cb69ff2167b4d64f25382b /core/fxcrt/xml_int.h
parentbea049784abf7c32d0b9758fc77d0e601d5c232b (diff)
downloadpdfium-d912f6ba083fed382a13c47aa06299e86d0b8c6b.tar.xz
Make concrete stream classes private to .cpp, part 2
Fix naming to say "Stream" Review-Url: https://codereview.chromium.org/2543043002
Diffstat (limited to 'core/fxcrt/xml_int.h')
-rw-r--r--core/fxcrt/xml_int.h47
1 files changed, 2 insertions, 45 deletions
diff --git a/core/fxcrt/xml_int.h b/core/fxcrt/xml_int.h
index d65fdad58c..f5beaef9ae 100644
--- a/core/fxcrt/xml_int.h
+++ b/core/fxcrt/xml_int.h
@@ -14,49 +14,6 @@
class CFX_UTF8Decoder;
class CXML_Element;
-class CXML_DataBufAcc : public IFX_BufferRead {
- public:
- CXML_DataBufAcc(const uint8_t* pBuffer, size_t size);
- ~CXML_DataBufAcc() override;
-
- // IFX_BufferRead
- void Release() override;
- bool IsEOF() override;
- FX_FILESIZE GetPosition() override;
- size_t ReadBlock(void* buffer, size_t size) override;
- bool ReadNextBlock(bool bRestart = false) override;
- const uint8_t* GetBlockBuffer() override;
- size_t GetBlockSize() override;
- FX_FILESIZE GetBlockOffset() override;
-
- protected:
- const uint8_t* m_pBuffer;
- size_t m_dwSize;
- size_t m_dwCurPos;
-};
-
-class CXML_DataStmAcc : public IFX_BufferRead {
- public:
- explicit CXML_DataStmAcc(IFX_SeekableReadStream* pFileRead);
- ~CXML_DataStmAcc() override;
-
- // IFX_BufferRead
- void Release() override;
- bool IsEOF() override;
- FX_FILESIZE GetPosition() override;
- size_t ReadBlock(void* buffer, size_t size) override;
- bool ReadNextBlock(bool bRestart = false) override;
- const uint8_t* GetBlockBuffer() override;
- size_t GetBlockSize() override;
- FX_FILESIZE GetBlockOffset() override;
-
- protected:
- IFX_SeekableReadStream* m_pFileRead;
- uint8_t* m_pBuffer;
- FX_FILESIZE m_nStart;
- size_t m_dwSize;
-};
-
class CXML_Parser {
public:
CXML_Parser();
@@ -64,7 +21,7 @@ class CXML_Parser {
bool Init(uint8_t* pBuffer, size_t size);
bool Init(IFX_SeekableReadStream* pFileRead);
- bool Init(IFX_BufferRead* pBuffer);
+ bool Init(IFX_BufferedReadStream* pBuffer);
bool Init(bool bOwndedStream);
bool ReadNextBlock();
bool IsEOF();
@@ -84,7 +41,7 @@ class CXML_Parser {
CXML_Element* pElement);
void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement);
- IFX_BufferRead* m_pDataAcc;
+ IFX_BufferedReadStream* m_pDataAcc;
bool m_bOwnedStream;
FX_FILESIZE m_nOffset;
bool m_bSaveSpaceChars;