From e06c542ffdc7325cb3c430e59bd0d9df4ddb7776 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 30 Nov 2017 21:48:20 +0000 Subject: Make parsers work off XFA_PacketType enum This CL changes the various parsers to use XFA_PacketType instead of XFA_XDPPACKET. This just leaves XFA_XDPPACKET for determining if a given node can be created in a given packet. Change-Id: I6fd23480c0c780a131d23b64b7c7e9d8684b0220 Reviewed-on: https://pdfium-review.googlesource.com/20013 Commit-Queue: dsinclair Reviewed-by: Henrique Nakashima Reviewed-by: Lei Zhang --- xfa/fxfa/parser/cxfa_simple_parser.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_simple_parser.h') diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h index f7465b64d6..5ae9b43be3 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.h +++ b/xfa/fxfa/parser/cxfa_simple_parser.h @@ -26,7 +26,7 @@ class CXFA_SimpleParser { ~CXFA_SimpleParser(); int32_t StartParse(const RetainPtr& pStream, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); int32_t DoParse(); CFX_XMLNode* ParseXMLData(const ByteString& wsXML); void ConstructXFANode(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode); @@ -38,7 +38,7 @@ class CXFA_SimpleParser { private: CXFA_Node* ParseAsXDPPacket(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); CXFA_Node* ParseAsXDPPacket_XDP(CFX_XMLNode* pXMLDocumentNode); CXFA_Node* ParseAsXDPPacket_Config(CFX_XMLNode* pXMLDocumentNode, XFA_PacketType ePacketID); @@ -77,7 +77,8 @@ class CXFA_SimpleParser { RetainPtr m_pFileRead; CXFA_Document* m_pFactory; CXFA_Node* m_pRootNode; - XFA_XDPPACKET m_ePacketID; + XFA_PacketType m_ePacketID; + bool m_bParseStarted; bool m_bDocumentParser; }; -- cgit v1.2.3