diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-04 19:12:16 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-04 19:12:16 +0000 |
| commit | 33beb4e4d34547a4de43f4dee4b2b0483c526b5e (patch) | |
| tree | 725d0e866857680a0a391ead73bf3e5c88132773 /fxjs/cfxjse_resolveprocessor.cpp | |
| parent | 47a90adb7da175cfefe99a3dc40f88521d99b879 (diff) | |
| download | pdfium-33beb4e4d34547a4de43f4dee4b2b0483c526b5e.tar.xz | |
Remove SetResultCreateNode
This CL removes the SetResultCreateNode method and inlines into the one
caller. The XFA_RESOLVENODE_RSTYPE enum is also renamed
XFA_ResolveNode_RSType to make it easier to find XFA_RESOLVENODE_RS
objects.
Change-Id: I937b612be062c5b7b05fd8d2822cd12cb882ba06
Reviewed-on: https://pdfium-review.googlesource.com/20370
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/cfxjse_resolveprocessor.cpp')
| -rw-r--r-- | fxjs/cfxjse_resolveprocessor.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/fxjs/cfxjse_resolveprocessor.cpp b/fxjs/cfxjse_resolveprocessor.cpp index eeeeefcf08..8e0c6fba1e 100644 --- a/fxjs/cfxjse_resolveprocessor.cpp +++ b/fxjs/cfxjse_resolveprocessor.cpp @@ -207,7 +207,7 @@ bool CFXJSE_ResolveProcessor::ResolveForAttributeRs( rnd.m_pScriptAttribute = lpScriptAttribute; rnd.m_Objects.push_back(curNode); - rnd.m_dwFlag = XFA_RESOLVENODE_RSTYPE_Attribute; + rnd.m_dwFlag = XFA_ResolveNode_RSType_Attribute; return true; } @@ -713,22 +713,6 @@ void CFXJSE_ResolveProcessor::SetStylesForChild(uint32_t dwParentStyles, rnd.m_dwStyles = dwSubStyles; } -int32_t CFXJSE_ResolveProcessor::SetResultCreateNode( - XFA_RESOLVENODE_RS* resolveNodeRS, - WideString& wsLastCondition) { - if (m_pNodeHelper->m_pCreateParent) - resolveNodeRS->objects.push_back(m_pNodeHelper->m_pCreateParent); - else - m_pNodeHelper->CreateNode_ForCondition(wsLastCondition); - - resolveNodeRS->dwFlags = m_pNodeHelper->m_iCreateFlag; - if (resolveNodeRS->dwFlags == XFA_RESOLVENODE_RSTYPE_CreateNodeOne) { - if (m_pNodeHelper->m_iCurAllStart != -1) - resolveNodeRS->dwFlags = XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll; - } - return pdfium::CollectionSize<int32_t>(resolveNodeRS->objects); -} - void CFXJSE_ResolveProcessor::SetIndexDataBind(WideString& wsNextCondition, int32_t& iIndex, int32_t iCount) { @@ -753,6 +737,6 @@ CFXJSE_ResolveNodeData::CFXJSE_ResolveNodeData(CFXJSE_Engine* pSC) m_Objects(), m_dwStyles(XFA_RESOLVENODE_Children), m_pScriptAttribute(nullptr), - m_dwFlag(XFA_RESOLVENODE_RSTYPE_Nodes) {} + m_dwFlag(XFA_ResolveNode_RSType_Nodes) {} CFXJSE_ResolveNodeData::~CFXJSE_ResolveNodeData() {} |