diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-02-13 21:44:33 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-13 21:44:33 +0000 |
| commit | fa3765cce4da4c3923e525f0462afd794360d221 (patch) | |
| tree | 2a246bc47d7584edf5d8dd2c124f6c21c26cd5c8 /fxjs | |
| parent | 9c112f92d4c2046d5a4f8538f4d18b74a87649d4 (diff) | |
| download | pdfium-fa3765cce4da4c3923e525f0462afd794360d221.tar.xz | |
Cleanup CFX_XMLNode pointers
This CL cleans up hte CFX_XMLNode pointers. Each pointer has been
renamed to make the usage clearer, the NodeItems method has been removed
in favour of distinct accessors and the node pointers have been made
private.
Change-Id: I5459a77a0ae93b08741a0cd59266ef9c81ddad75
Reviewed-on: https://pdfium-review.googlesource.com/26550
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/xfa/cjx_node.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp index e5396b7c90..8009208561 100644 --- a/fxjs/xfa/cjx_node.cpp +++ b/fxjs/xfa/cjx_node.cpp @@ -246,16 +246,15 @@ CJS_Return CJX_Node::loadXML(CFX_V8* runtime, } if (bIgnoreRoot) { - CFX_XMLNode* pXMLChild = pXMLNode->GetNodeItem(CFX_XMLNode::FirstChild); + CFX_XMLNode* pXMLChild = pXMLNode->GetFirstChild(); while (pXMLChild) { - CFX_XMLNode* pXMLSibling = - pXMLChild->GetNodeItem(CFX_XMLNode::NextSibling); + CFX_XMLNode* pXMLSibling = pXMLChild->GetNextSibling(); pXMLNode->RemoveChildNode(pXMLChild); pFakeXMLRoot->AppendChild(pXMLChild); pXMLChild = pXMLSibling; } } else { - CFX_XMLNode* pXMLParent = pXMLNode->GetNodeItem(CFX_XMLNode::Parent); + CFX_XMLNode* pXMLParent = pXMLNode->GetParent(); if (pXMLParent) pXMLParent->RemoveChildNode(pXMLNode); @@ -291,7 +290,7 @@ CJS_Return CJX_Node::loadXML(CFX_V8* runtime, CFX_XMLNode* pTempXMLNode = GetXFANode()->GetXMLMappingNode(); GetXFANode()->SetXMLMappingNode(pFakeXMLRoot.release()); GetXFANode()->SetFlag(XFA_NodeFlag_OwnXMLNode, false); - if (pTempXMLNode && !pTempXMLNode->GetNodeItem(CFX_XMLNode::Parent)) + if (pTempXMLNode && !pTempXMLNode->GetParent()) pFakeXMLRoot.reset(pTempXMLNode); else pFakeXMLRoot = nullptr; |