Remove out parameter from CFXJSE_ResolveProcessor::SetIndexDataBind() Then rename to better describe what it does. Change-Id: Ief25e6fd1fe8b6784483ccce9563c2fdca9a4e0e Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/80530 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/xfa/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp index 54edb0d..e7c9630 100644 --- a/fxjs/xfa/cfxjse_engine.cpp +++ b/fxjs/xfa/cfxjse_engine.cpp
@@ -708,7 +708,7 @@ nNodes > 1) { CFXJSE_ResolveNodeData rndBind(nullptr); m_ResolveProcessor->GetFilter(wsExpression, nStart, rndBind); - m_ResolveProcessor->SetIndexDataBind(rndBind.m_wsCondition, i, nNodes); + i = m_ResolveProcessor->IndexForDataBind(rndBind.m_wsCondition, nNodes); bDataBind = true; } rndFind.m_CurObject = findObjects[i++].Get();
diff --git a/fxjs/xfa/cfxjse_resolveprocessor.cpp b/fxjs/xfa/cfxjse_resolveprocessor.cpp index a045eb6..0efb1dd 100644 --- a/fxjs/xfa/cfxjse_resolveprocessor.cpp +++ b/fxjs/xfa/cfxjse_resolveprocessor.cpp
@@ -730,18 +730,13 @@ rnd.m_dwStyles = dwSubStyles; } -void CFXJSE_ResolveProcessor::SetIndexDataBind(WideString& wsNextCondition, - int32_t& iIndex, - int32_t iCount) { - if (m_pNodeHelper->CreateNodeForCondition(wsNextCondition)) { - if (m_pNodeHelper->m_eLastCreateType == XFA_Element::DataGroup) { - iIndex = 0; - } else { - iIndex = iCount - 1; - } - } else { - iIndex = iCount - 1; +int32_t CFXJSE_ResolveProcessor::IndexForDataBind(WideString& wsNextCondition, + int32_t iCount) { + if (m_pNodeHelper->CreateNodeForCondition(wsNextCondition) && + m_pNodeHelper->m_eLastCreateType == XFA_Element::DataGroup) { + return 0; } + return iCount - 1; } CFXJSE_ResolveNodeData::CFXJSE_ResolveNodeData(CFXJSE_Engine* pSC)
diff --git a/fxjs/xfa/cfxjse_resolveprocessor.h b/fxjs/xfa/cfxjse_resolveprocessor.h index 9e32a1f..319a0ba 100644 --- a/fxjs/xfa/cfxjse_resolveprocessor.h +++ b/fxjs/xfa/cfxjse_resolveprocessor.h
@@ -45,9 +45,7 @@ int32_t GetFilter(WideStringView wsExpression, int32_t nStart, CFXJSE_ResolveNodeData& rnd); - void SetIndexDataBind(WideString& wsNextCondition, - int32_t& iIndex, - int32_t iCount); + int32_t IndexForDataBind(WideString& wsNextCondition, int32_t iCount); void SetCurStart(int32_t start) { m_iCurStart = start; } CFXJSE_NodeHelper* GetNodeHelper() { return m_pNodeHelper.get(); }