diff options
| author | dan sinclair <dsinclair@chromium.org> | 2018-04-23 18:24:56 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-23 18:24:56 +0000 |
| commit | c6077a0164340fa084be03eb059d608bc2675b2b (patch) | |
| tree | 231e50c0ccb14b6a2a2554fe9215e7aff0dbcf81 /core/fxcrt/xml/cfx_xmlparser.h | |
| parent | 9a3a7709103a872037dcea1f3cf0b7785a3da191 (diff) | |
| download | pdfium-c6077a0164340fa084be03eb059d608bc2675b2b.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcrt/xml/cfx_xmlparser.h')
| -rw-r--r-- | core/fxcrt/xml/cfx_xmlparser.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/fxcrt/xml/cfx_xmlparser.h b/core/fxcrt/xml/cfx_xmlparser.h index f369453de1..6405b61a64 100644 --- a/core/fxcrt/xml/cfx_xmlparser.h +++ b/core/fxcrt/xml/cfx_xmlparser.h @@ -12,14 +12,13 @@ #include <vector> #include "core/fxcrt/cfx_blockbuffer.h" -#include "core/fxcrt/cfx_seekablestreamproxy.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/xml/cfx_xmlnode.h" class CFX_XMLElement; class CFX_XMLNode; -class IFX_SeekableStream; +class IFX_SeekableReadStream; enum class FX_XmlSyntaxResult { None, @@ -44,7 +43,7 @@ class CFX_XMLParser { static bool IsXMLNameChar(wchar_t ch, bool bFirstChar); CFX_XMLParser(CFX_XMLNode* pParent, - const RetainPtr<IFX_SeekableStream>& pStream); + const RetainPtr<IFX_SeekableReadStream>& pStream); virtual ~CFX_XMLParser(); bool Parse(); @@ -100,11 +99,9 @@ class CFX_XMLParser { std::stack<CFX_XMLNode*> m_NodeStack; WideString m_ws1; - RetainPtr<CFX_SeekableStreamProxy> m_pStream; + RetainPtr<IFX_SeekableReadStream> m_pStream; size_t m_iXMLPlaneSize; - FX_FILESIZE m_iCurrentPos; std::vector<wchar_t> m_Buffer; - bool m_bEOS; FX_FILESIZE m_Start; // Start position in m_Buffer FX_FILESIZE m_End; // End position in m_Buffer FX_XMLNODETYPE m_CurNodeType; |