diff options
| author | dsinclair <dsinclair@chromium.org> | 2018-04-23 18:34:57 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-23 18:34:57 +0000 |
| commit | 857231a0723c0bf74ea6c13f1c3ce56548e23303 (patch) | |
| tree | 262538d8f7f8e5b9703a7c37e7ec2f1b477aebe3 /core/fxcrt/xml/cfx_xmlparser.h | |
| parent | c6077a0164340fa084be03eb059d608bc2675b2b (diff) | |
| download | pdfium-857231a0723c0bf74ea6c13f1c3ce56548e23303.tar.xz | |
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 <dsinclair@chromium.org>
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
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 <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/xml/cfx_xmlparser.h')
| -rw-r--r-- | core/fxcrt/xml/cfx_xmlparser.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/fxcrt/xml/cfx_xmlparser.h b/core/fxcrt/xml/cfx_xmlparser.h index 6405b61a64..f369453de1 100644 --- a/core/fxcrt/xml/cfx_xmlparser.h +++ b/core/fxcrt/xml/cfx_xmlparser.h @@ -12,13 +12,14 @@ #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_SeekableReadStream; +class IFX_SeekableStream; enum class FX_XmlSyntaxResult { None, @@ -43,7 +44,7 @@ class CFX_XMLParser { static bool IsXMLNameChar(wchar_t ch, bool bFirstChar); CFX_XMLParser(CFX_XMLNode* pParent, - const RetainPtr<IFX_SeekableReadStream>& pStream); + const RetainPtr<IFX_SeekableStream>& pStream); virtual ~CFX_XMLParser(); bool Parse(); @@ -99,9 +100,11 @@ class CFX_XMLParser { std::stack<CFX_XMLNode*> m_NodeStack; WideString m_ws1; - RetainPtr<IFX_SeekableReadStream> m_pStream; + RetainPtr<CFX_SeekableStreamProxy> 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; |