diff options
author | dsinclair <dsinclair@chromium.org> | 2018-02-08 20:55:41 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-08 20:55:41 +0000 |
commit | 3c62d20a385d31315a392206de53c9fe72a08db1 (patch) | |
tree | 099f515344a6611f84acd84bab8c8642175292ab /xfa/fxfa/parser/cxfa_node.h | |
parent | b3f1046cb2c9bb7fc2a2579b76c8e65b24323002 (diff) | |
download | pdfium-3c62d20a385d31315a392206de53c9fe72a08db1.tar.xz |
Revert "Convert CXFA_Node to store a vector of children"
This reverts commit f0e386de64e030f6d692acfa27e2bc0a50018710.
Reason for revert: After chatting with tsepez@, we've got a better direction to take these changes.
Original change's description:
> Convert CXFA_Node to store a vector of children
>
> This CL changes CXFA_Node to use a vector of nodes as children instead
> of a singly linked list of siblings and child pointers.
>
> Change-Id: Ica8219f63d783a07d90b9541ae62a35c49166e44
> Reviewed-on: https://pdfium-review.googlesource.com/26030
> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
> Commit-Queue: dsinclair <dsinclair@chromium.org>
TBR=dsinclair@chromium.org,hnakashima@chromium.org,rharrison@chromium.org
Change-Id: I115779a292d39694ad5faf0b748a617c491b40f0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://pdfium-review.googlesource.com/26070
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_node.h')
-rw-r--r-- | xfa/fxfa/parser/cxfa_node.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index c849b19248..c3b2fd1b84 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -178,9 +178,9 @@ class CXFA_Node : public CXFA_Object { CXFA_Node* Clone(bool bRecursive); - CXFA_Node* GetNextSibling() const; + CXFA_Node* GetNextSibling() const { return m_pNext; } CXFA_Node* GetPrevSibling() const; - CXFA_Node* GetFirstChild() const; + CXFA_Node* GetFirstChild() const { return m_pChild; } CXFA_Node* GetParent() const { return parent_.Get(); } CXFA_Node* GetNextContainerSibling() const; @@ -420,6 +420,7 @@ class CXFA_Node : public CXFA_Object { WideString GetValidateMessage(bool bError, bool bVersionFlag); bool HasFlag(XFA_NodeFlag dwFlag) const; + CXFA_Node* Deprecated_GetPrevSibling(); const PropertyData* GetPropertyData(XFA_Element property) const; const AttributeData* GetAttributeData(XFA_Attribute attr) const; Optional<XFA_Element> GetFirstPropertyWithFlag(uint8_t flag); @@ -488,15 +489,12 @@ class CXFA_Node : public CXFA_Object { CXFA_Event* event, CXFA_EventParam* pEventParam); - CXFA_Node* GetNodeBefore(const CXFA_Node* node) const; - CXFA_Node* GetNodeAfter(const CXFA_Node* node) const; - CXFA_Node* GetContainerBefore(const CXFA_Node* node) const; - CXFA_Node* GetContainerAfter(const CXFA_Node* node) const; - const PropertyData* const m_Properties; const AttributeData* const m_Attributes; const uint32_t m_ValidPackets; - std::vector<CXFA_Node*> children_; + CXFA_Node* m_pNext; + CXFA_Node* m_pChild; + CXFA_Node* m_pLastChild; UnownedPtr<CXFA_Node> parent_; CFX_XMLNode* m_pXMLNode; const XFA_PacketType m_ePacket; |