diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-06-16 07:45:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-16 07:45:23 -0700 |
| commit | 3fa3351c90332cd51e67bf4624c57bd0ba78e4a6 (patch) | |
| tree | ccf2f14011ce44862e0e3b9ad9fb85ceebab9a05 /xfa/fxfa/parser | |
| parent | 5377267504015d056bc0860ffadc23289b21039d (diff) | |
| download | pdfium-3fa3351c90332cd51e67bf4624c57bd0ba78e4a6.tar.xz | |
Cleanup XML parser code.
This Cl removes the CFDE_XMLSAXParser and CFDE_XMLDOMParser along with the
::LoadXML() method which would create them, it was never called. It also
cleans up the use of virtual in the various XML classes.
Review-Url: https://codereview.chromium.org/2067253002
Diffstat (limited to 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/xfa_parser.h | 1 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_parser_imp.h | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_utils.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/xfa_parser.h b/xfa/fxfa/parser/xfa_parser.h index 5ccc1af199..b6c81e9f18 100644 --- a/xfa/fxfa/parser/xfa_parser.h +++ b/xfa/fxfa/parser/xfa_parser.h @@ -15,6 +15,7 @@ class IXFA_Parser { public: static IXFA_Parser* Create(CXFA_Document* pFactory, FX_BOOL bDocumentParser = FALSE); + virtual ~IXFA_Parser() {} virtual void Release() = 0; virtual int32_t StartParse(IFX_FileRead* pStream, diff --git a/xfa/fxfa/parser/xfa_parser_imp.h b/xfa/fxfa/parser/xfa_parser_imp.h index 2485ddfcd2..1f117be64e 100644 --- a/xfa/fxfa/parser/xfa_parser_imp.h +++ b/xfa/fxfa/parser/xfa_parser_imp.h @@ -109,7 +109,6 @@ class CXFA_DocumentParser : public IXFA_Parser { CXFA_FFNotify* m_pNotify; CXFA_Document* m_pDocument; }; -typedef CFX_StackTemplate<CFDE_XMLNode*> CXFA_XMLNodeStack; class CXFA_XMLParser : public CFDE_XMLParser { public: @@ -131,7 +130,7 @@ class CXFA_XMLParser : public CFDE_XMLParser { CFDE_XMLSyntaxParser* m_pParser; CFDE_XMLNode* m_pParent; CFDE_XMLNode* m_pChild; - CXFA_XMLNodeStack m_NodeStack; + CFX_StackTemplate<CFDE_XMLNode*> m_NodeStack; CFX_WideString m_ws1; CFX_WideString m_ws2; FDE_XmlSyntaxResult m_syntaxParserResult; diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h index d6633a4c7f..5b8057526a 100644 --- a/xfa/fxfa/parser/xfa_utils.h +++ b/xfa/fxfa/parser/xfa_utils.h @@ -8,6 +8,8 @@ #define XFA_FXFA_PARSER_XFA_UTILS_H_ #include "xfa/fde/xml/fde_xml.h" +#include "xfa/fgas/crt/fgas_stream.h" +#include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fxfa/include/fxfa_basic.h" class CFDE_XMLElement; |