Remove unused parameter in CXFA_LayoutPageMgr::ProcessOverflow(). Change-Id: I5d59c600ff4cd639707cc871fe31fae7490553ab Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/49471 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp index cf49fff..2d37da0 100644 --- a/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp +++ b/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
@@ -2462,7 +2462,7 @@ bUseInherited = true; } if (m_pPageMgr->ProcessOverflow(pFormNode, pOverflowLeaderNode, - pOverflowTrailerNode, false, false)) { + pOverflowTrailerNode, false)) { if (pProcessor->JudgeLeaderOrTrailerForOccur(pOverflowTrailerNode)) { if (pOverflowTrailerNode) { auto pOverflowLeaderProcessor = @@ -2586,7 +2586,7 @@ if (m_pPageMgr && !pProcessor->m_bUseInheriated && eRetValue != Result::kPageFullBreak) { m_pPageMgr->ProcessOverflow(pFormNode, pTempLeaderNode, pTempTrailerNode, - false, true); + true); } if (pTrailerLayoutItem && bIsAddTrailerHeight) { pProcessor->AddTrailerBeforeSplit(fSplitPos, pTrailerLayoutItem, @@ -2636,7 +2636,7 @@ pFormNode = pLayoutContext->m_pOverflowProcessor->GetFormNode(); m_pPageMgr->ProcessOverflow(pFormNode, pTempLeaderNode, - pTempTrailerNode, false, true); + pTempTrailerNode, true); } if (bUseInherited) { pProcessor->ProcessUnUseOverFlow(pOverflowLeaderNode, @@ -2665,7 +2665,7 @@ eLayout == XFA_AttributeValue::Tb) { if (m_pPageMgr) { m_pPageMgr->ProcessOverflow(pFormNode, pOverflowLeaderNode, - pOverflowTrailerNode, false, true); + pOverflowTrailerNode, true); } if (pTrailerLayoutItem) pProcessor->AddTrailerBeforeSplit(fSplitPos, pTrailerLayoutItem, false); @@ -2682,7 +2682,7 @@ pFormNode = pLayoutContext->m_pOverflowProcessor->GetFormNode(); if (m_pPageMgr) { m_pPageMgr->ProcessOverflow(pFormNode, pOverflowLeaderNode, - pOverflowTrailerNode, false, true); + pOverflowTrailerNode, true); } if (bUseInherited) { pProcessor->ProcessUnUseOverFlow(pOverflowLeaderNode, pOverflowTrailerNode,
diff --git a/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp b/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp index de4d152..e651257 100644 --- a/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp +++ b/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp
@@ -996,18 +996,14 @@ bool CXFA_LayoutPageMgr::ProcessOverflow(CXFA_Node* pFormNode, CXFA_Node*& pLeaderNode, CXFA_Node*& pTrailerNode, - bool bDataMerge, bool bCreatePage) { if (!pFormNode) return false; CXFA_Node* pLeaderTemplate = nullptr; CXFA_Node* pTrailerTemplate = nullptr; - bool bIsOverflowNode = false; - if (pFormNode->GetElementType() == XFA_Element::Overflow || - pFormNode->GetElementType() == XFA_Element::Break) { - bIsOverflowNode = true; - } + bool bIsOverflowNode = pFormNode->GetElementType() == XFA_Element::Overflow || + pFormNode->GetElementType() == XFA_Element::Break; for (CXFA_Node* pCurNode = bIsOverflowNode ? pFormNode : pFormNode->GetFirstChild(); pCurNode; pCurNode = pCurNode->GetNextSibling()) {
diff --git a/xfa/fxfa/layout/cxfa_layoutpagemgr.h b/xfa/fxfa/layout/cxfa_layoutpagemgr.h index 8d3471b..0180181 100644 --- a/xfa/fxfa/layout/cxfa_layoutpagemgr.h +++ b/xfa/fxfa/layout/cxfa_layoutpagemgr.h
@@ -45,7 +45,6 @@ bool ProcessOverflow(CXFA_Node* pFormNode, CXFA_Node*& pLeaderNode, CXFA_Node*& pTrailerNode, - bool bDataMerge, bool bCreatePage); CXFA_Node* QueryOverflow(CXFA_Node* pFormNode); CXFA_Node* ProcessBookendLeader(const CXFA_Node* pBookendNode);