Remove unused bUsePageBreak arg from GotoNextContainerNode() It has never had any effect (looking as far back as 2014). In turn, do the same to GotoNextContainerNodeSimple(). Change-Id: Iead67bc2d5d36da963235ff9c686969e4c6da49a Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/92311 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp index d814f6f..5c616f1 100644 --- a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp +++ b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
@@ -851,15 +851,13 @@ return pLayoutItem; } -void CXFA_ContentLayoutProcessor::GotoNextContainerNodeSimple( - bool bUsePageBreak) { +void CXFA_ContentLayoutProcessor::GotoNextContainerNodeSimple() { std::tie(m_nCurChildNodeStage, m_pCurChildNode) = GotoNextContainerNode( - m_nCurChildNodeStage, bUsePageBreak, GetFormNode(), m_pCurChildNode); + m_nCurChildNodeStage, GetFormNode(), m_pCurChildNode); } std::pair<CXFA_ContentLayoutProcessor::Stage, CXFA_Node*> CXFA_ContentLayoutProcessor::GotoNextContainerNode(Stage nCurStage, - bool bUsePageBreak, CXFA_Node* pParentContainer, CXFA_Node* pCurActionNode) { CXFA_Node* pChildContainer = nullptr; @@ -999,8 +997,8 @@ CXFA_LayoutItem* pBeforeItem = nullptr; Stage nCurChildNodeStage = Stage::kNone; while (true) { - std::tie(nCurChildNodeStage, pCurChildNode) = GotoNextContainerNode( - nCurChildNodeStage, false, pFormNode, pCurChildNode); + std::tie(nCurChildNodeStage, pCurChildNode) = + GotoNextContainerNode(nCurChildNodeStage, pFormNode, pCurChildNode); if (!pCurChildNode) break; @@ -1068,10 +1066,10 @@ float fHiddenContentCalculatedWidth = 0; float fHiddenContentCalculatedHeight = 0; if (!m_pCurChildNode) - GotoNextContainerNodeSimple(false); + GotoNextContainerNodeSimple(); int32_t iColIndex = 0; - for (; m_pCurChildNode; GotoNextContainerNodeSimple(false)) { + for (; m_pCurChildNode; GotoNextContainerNodeSimple()) { if (m_nCurChildNodeStage != Stage::kContainer) continue; if (m_pCurChildNode->GetElementType() == XFA_Element::Variables) @@ -1207,9 +1205,9 @@ Context* pLayoutContext = iSpecifiedColumnCount > 0 ? &layoutContext : nullptr; if (!m_pCurChildNode) - GotoNextContainerNodeSimple(false); + GotoNextContainerNodeSimple(); - for (; m_pCurChildNode; GotoNextContainerNodeSimple(false)) { + for (; m_pCurChildNode; GotoNextContainerNodeSimple()) { layoutContext.m_fCurColumnWidth.reset(); if (m_nCurChildNodeStage != Stage::kContainer) continue; @@ -1566,7 +1564,7 @@ fContentCurRowY += InsertKeepLayoutItems(); if (m_nCurChildNodeStage == Stage::kNone) - GotoNextContainerNodeSimple(true); + GotoNextContainerNodeSimple(); fContentCurRowY += InsertPendingItems(GetFormNode()); if (m_pCurChildPreprocessor && m_nCurChildNodeStage == Stage::kContainer) { @@ -1681,7 +1679,7 @@ &bAddedItemInRow, &bForceEndPage, pContext, false); } } - GotoNextContainerNodeSimple(true); + GotoNextContainerNodeSimple(); bForceEndPage = true; bIsManualBreak = true; goto SuspendAndCreateNewRow; @@ -1739,7 +1737,7 @@ AddPendingNode(pLeaderNode, true); } - GotoNextContainerNodeSimple(true); + GotoNextContainerNodeSimple(); if (bCreatePage) { bForceEndPage = true; bIsManualBreak = true; @@ -1864,7 +1862,7 @@ default: break; } - GotoNextContainerNodeSimple(true); + GotoNextContainerNodeSimple(); if (bAddedItemInRow && eFlowStrategy == XFA_AttributeValue::Tb) break; continue;
diff --git a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.h b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.h index 51fa4e3..b4b6c43 100644 --- a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.h +++ b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.h
@@ -146,12 +146,11 @@ bool bRootForceTb); void DoLayoutField(); - void GotoNextContainerNodeSimple(bool bUsePageBreak); + void GotoNextContainerNodeSimple(); // Return new stage and new action node. std::pair<Stage, CXFA_Node*> GotoNextContainerNode( Stage nCurStage, - bool bUsePageBreak, CXFA_Node* pParentContainer, CXFA_Node* pCurActionNode);