From 18a6069f5ce332b2bab97bf3a6d8ea9528d69791 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 10 Jan 2018 16:30:56 +0000 Subject: Remove CXFA_Node::GetNodeItem This CL removes the generic CXFA_Node::GetNodeItem(type) method for specific calls to get the parent, child or siblings. Change-Id: Ief68284ac7b954aaa4ed7120dd82a39f8b52656a Reviewed-on: https://pdfium-review.googlesource.com/22650 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/cfxjse_resolveprocessor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fxjs/cfxjse_resolveprocessor.cpp') diff --git a/fxjs/cfxjse_resolveprocessor.cpp b/fxjs/cfxjse_resolveprocessor.cpp index b602db24ec..58fd3cd8eb 100644 --- a/fxjs/cfxjse_resolveprocessor.cpp +++ b/fxjs/cfxjse_resolveprocessor.cpp @@ -233,8 +233,8 @@ bool CFXJSE_ResolveProcessor::ResolveNormal(CFXJSE_ResolveNodeData& rnd) { std::vector properties; CXFA_Node* pVariablesNode = nullptr; CXFA_Node* pPageSetNode = nullptr; - for (CXFA_Node* pChild = curNode->GetNodeItem(XFA_NODEITEM_FirstChild); - pChild; pChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling)) { + for (CXFA_Node* pChild = curNode->GetFirstChild(); pChild; + pChild = pChild->GetNextSibling()) { if (pChild->GetElementType() == XFA_Element::Variables) { pVariablesNode = pChild; continue; @@ -378,7 +378,7 @@ bool CFXJSE_ResolveProcessor::ResolveNormal(CFXJSE_ResolveNodeData& rnd) { } if (dwStyles & XFA_RESOLVENODE_Siblings) { - CXFA_Node* child = parentNode->GetNodeItem(XFA_NODEITEM_FirstChild); + CXFA_Node* child = parentNode->GetFirstChild(); uint32_t dwSubStyles = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties; if (dwStyles & XFA_RESOLVENODE_TagName) @@ -402,7 +402,7 @@ bool CFXJSE_ResolveProcessor::ResolveNormal(CFXJSE_ResolveNodeData& rnd) { } } } - child = child->GetNodeItem(XFA_NODEITEM_NextSibling); + child = child->GetNextSibling(); continue; } @@ -437,7 +437,7 @@ bool CFXJSE_ResolveProcessor::ResolveNormal(CFXJSE_ResolveNodeData& rnd) { rndFind.m_Objects.end()); rndFind.m_Objects.clear(); } - child = child->GetNodeItem(XFA_NODEITEM_NextSibling); + child = child->GetNextSibling(); } if (rnd.m_Objects.size() > nNum) { if (m_pNodeHelper->NodeIsTransparent(parentNode)) { -- cgit v1.2.3