diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-04-23 20:04:39 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-23 20:04:39 +0000 |
| commit | 4e4147eccd25e66a5c61712121c30c8d5f2ba56c (patch) | |
| tree | 054553a3d2b26118288bbfa70fc49dfc4cd503fa /core/fxcrt/xml/cfx_xmlparser.h | |
| parent | a3dd6c390ebc2af63fc0b706a4747315acef02bf (diff) | |
| download | pdfium-4e4147eccd25e66a5c61712121c30c8d5f2ba56c.tar.xz | |
Make CFX_SeekableStreamProxy a subclass of IFX_SeekableReadStreamchromium/3405
This CL changes CFX_SeekableStreamProxy to be an IFX_SeekableReadStream
subclass.
This is a reland of https://pdfium-review.googlesource.com/c/pdfium/+/30879
after fix bad merge.
Change-Id: Iad58abe7e065541867f202059a944e9be4da5713
Reviewed-on: https://pdfium-review.googlesource.com/31195
Reviewed-by: Henrique Nakashima <hnakashima@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, 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; |