From 9daec60824d085db8c2f841fd389c725df1f8b0b Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 30 Nov 2017 21:26:51 +0000 Subject: Cleanup XFA packet code Remove GetPacketByID, move GetPacketByName to the xfa_utils file. Cleanup CreateNode to accept the XFA_XDPPACKET instead of the packet info. Change-Id: I0f246c84f61b6b4175ca307bdcd125d9bc24bb1e Reviewed-on: https://pdfium-review.googlesource.com/20010 Reviewed-by: Henrique Nakashima Reviewed-by: Lei Zhang Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_node.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_node.h') diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 3e05f36fab..a2e8b3042c 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -84,7 +84,7 @@ class CXFA_Node : public CXFA_Object { XFA_Attribute GetAttribute(size_t i) const; XFA_AttributeType GetAttributeType(XFA_Attribute type) const; - uint32_t GetPacketID() const { return m_ePacket; } + XFA_XDPPACKET GetPacketID() const { return m_ePacket; } void SetFlag(uint32_t dwFlag, bool bNotify); void ClearFlag(uint32_t dwFlag); @@ -182,7 +182,7 @@ class CXFA_Node : public CXFA_Object { protected: CXFA_Node(CXFA_Document* pDoc, - uint16_t ePacket, + XFA_XDPPACKET ePacket, uint32_t validPackets, XFA_ObjectType oType, XFA_Element eType, @@ -200,15 +200,15 @@ class CXFA_Node : public CXFA_Object { pdfium::Optional GetDefaultValue(XFA_Attribute attr, XFA_AttributeType eType) const; - const PropertyData* m_Properties; - const AttributeData* m_Attributes; - uint32_t m_ValidPackets; + const PropertyData* const m_Properties; + const AttributeData* const m_Attributes; + const uint32_t m_ValidPackets; CXFA_Node* m_pNext; CXFA_Node* m_pChild; CXFA_Node* m_pLastChild; CXFA_Node* m_pParent; CFX_XMLNode* m_pXMLNode; - uint16_t m_ePacket; + const XFA_XDPPACKET m_ePacket; uint16_t m_uNodeFlags; uint32_t m_dwNameHash; CXFA_Node* m_pAuxNode; -- cgit v1.2.3