commit a7df4cb631906cb4b839eec7a0734b830cabbe55
author Tom Sepez <tsepez@chromium.org> Sat Jun 05 00:01:01 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jun 05 00:01:01 2021 +0000
tree 6298e0fe17ac60aa0960e699dc2bf975b4293d5b
parent f3c22ac45c6cb45ea0a3c5788505e9a4272b9e68

Remove bool arg from CXFA_LayoutProcessor::StartLayout()

Add RestartLayout() to cover the other case.

Change-Id: Icab91a3c325ec36148ea33612af2da30a862c381
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/81331
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fxfa/cxfa_ffdocview.cpp

diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 7df3561..52e8a0b 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -86,7 +86,7 @@
   m_pDoc->GetXFADoc()->DoProtoMerge();
   m_pDoc->GetXFADoc()->DoDataMerge();
 
-  int32_t iStatus = GetLayoutProcessor()->StartLayout(false);
+  int32_t iStatus = GetLayoutProcessor()->StartLayout();
   if (iStatus < 0)
     return iStatus;
 
@@ -470,7 +470,7 @@
   m_bInLayoutStatus = true;
 
   CXFA_LayoutProcessor* pProcessor = GetLayoutProcessor();
-  if (!pProcessor->IncrementLayout() && pProcessor->StartLayout(false) < 100) {
+  if (!pProcessor->IncrementLayout() && pProcessor->StartLayout() < 100) {
     pProcessor->DoLayout();
     UnlockUpdate();
     m_bInLayoutStatus = false;

xfa/fxfa/layout/cxfa_layoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_layoutprocessor.cpp b/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
index d7f1149..4255130 100644
--- a/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
@@ -43,10 +43,11 @@
   m_bNeedLayout = true;
 }
 
-int32_t CXFA_LayoutProcessor::StartLayout(bool bForceRestart) {
-  if (!bForceRestart && !NeedLayout())
-    return 100;
+int32_t CXFA_LayoutProcessor::StartLayout() {
+  return NeedLayout() ? RestartLayout() : 100;
+}
 
+int32_t CXFA_LayoutProcessor::RestartLayout() {
   m_pContentLayoutProcessor = nullptr;
   m_nProgressCounter = 0;
   CXFA_Node* pFormPacketNode =
@@ -118,7 +119,7 @@
 
 bool CXFA_LayoutProcessor::IncrementLayout() {
   if (m_bNeedLayout) {
-    StartLayout(true);
+    RestartLayout();
     return DoLayout() == 100;
   }
   return m_rgChangedContainers.empty();

xfa/fxfa/layout/cxfa_layoutprocessor.h

diff --git a/xfa/fxfa/layout/cxfa_layoutprocessor.h b/xfa/fxfa/layout/cxfa_layoutprocessor.h
index bd3aa28..083460d 100644
--- a/xfa/fxfa/layout/cxfa_layoutprocessor.h
+++ b/xfa/fxfa/layout/cxfa_layoutprocessor.h
@@ -41,7 +41,8 @@
   void AddChangedContainer(CXFA_Node* pContainer) override;
 
   cppgc::Heap* GetHeap() { return m_pHeap.Get(); }
-  int32_t StartLayout(bool bForceRestart);
+  int32_t StartLayout();
+  int32_t RestartLayout();
   int32_t DoLayout();
   bool IncrementLayout();
   int32_t CountPages() const;