Remove always-true argument to SetForceRelayout() and DoDataRemerge()
Change-Id: I0e68a019875d4fc835679df27061a921e76fe9dd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/79452
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp
index 4f33149..16b1cb1 100644
--- a/fxjs/xfa/cjx_form.cpp
+++ b/fxjs/xfa/cjx_form.cpp
@@ -61,7 +61,7 @@
if (!params.empty())
return CJS_Result::Failure(JSMessage::kParamError);
- GetDocument()->DoDataRemerge(true);
+ GetDocument()->DoDataRemerge();
return CJS_Result::Success();
}
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
index 98276b4..121ef41 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -412,7 +412,7 @@
if (pContentRootNode)
pLayoutProcessor->AddChangedContainer(pContentRootNode);
}
- pLayoutProcessor->SetForceRelayout(true);
+ pLayoutProcessor->SetForceRelayout();
return CJS_Result::Success();
}
diff --git a/fxjs/xfa/cjx_template.cpp b/fxjs/xfa/cjx_template.cpp
index 95ba486..6161bd4 100644
--- a/fxjs/xfa/cjx_template.cpp
+++ b/fxjs/xfa/cjx_template.cpp
@@ -47,7 +47,7 @@
if (!params.empty())
return CJS_Result::Failure(JSMessage::kParamError);
- GetDocument()->DoDataRemerge(true);
+ GetDocument()->DoDataRemerge();
return CJS_Result::Success();
}
diff --git a/xfa/fxfa/layout/cxfa_layoutprocessor.cpp b/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
index f299f2f..d7f1149 100644
--- a/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_layoutprocessor.cpp
@@ -39,8 +39,8 @@
ContainerTrace(visitor, m_rgChangedContainers);
}
-void CXFA_LayoutProcessor::SetForceRelayout(bool bForceRestart) {
- m_bNeedLayout = bForceRestart;
+void CXFA_LayoutProcessor::SetForceRelayout() {
+ m_bNeedLayout = true;
}
int32_t CXFA_LayoutProcessor::StartLayout(bool bForceRestart) {
diff --git a/xfa/fxfa/layout/cxfa_layoutprocessor.h b/xfa/fxfa/layout/cxfa_layoutprocessor.h
index a37115c..bd3aa28 100644
--- a/xfa/fxfa/layout/cxfa_layoutprocessor.h
+++ b/xfa/fxfa/layout/cxfa_layoutprocessor.h
@@ -37,7 +37,7 @@
void Trace(cppgc::Visitor* visitor) const override;
// CXFA_Document::LayoutProcessorIface:
- void SetForceRelayout(bool bForceRestart) override;
+ void SetForceRelayout() override;
void AddChangedContainer(CXFA_Node* pContainer) override;
cppgc::Heap* GetHeap() { return m_pHeap.Get(); }
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index f00c752..3d4b219 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -1821,7 +1821,7 @@
}
}
-void CXFA_Document::DoDataRemerge(bool bDoDataMerge) {
+void CXFA_Document::DoDataRemerge() {
CXFA_Node* pFormRoot = ToNode(GetXFAObject(XFA_HASHCODE_Form));
if (pFormRoot) {
while (CXFA_Node* pNode = pFormRoot->GetFirstChild())
@@ -1830,11 +1830,8 @@
pFormRoot->SetBindingNode(nullptr);
}
m_rgGlobalBinding.clear();
-
- if (bDoDataMerge)
- DoDataMerge();
-
- GetLayoutProcessor()->SetForceRelayout(true);
+ DoDataMerge();
+ GetLayoutProcessor()->SetForceRelayout();
}
CXFA_Node* CXFA_Document::GetGlobalBinding(uint32_t dwNameHash) {
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index c27d76a..3631566 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -67,7 +67,7 @@
virtual ~LayoutProcessorIface();
virtual void Trace(cppgc::Visitor* visitor) const;
- virtual void SetForceRelayout(bool enable) = 0;
+ virtual void SetForceRelayout() = 0;
virtual void AddChangedContainer(CXFA_Node* pContainer) = 0;
void SetDocument(CXFA_Document* pDocument) { m_pDocument = pDocument; }
@@ -121,7 +121,7 @@
void DoProtoMerge();
void DoDataMerge();
- void DoDataRemerge(bool bDoDataMerge);
+ void DoDataRemerge();
CXFA_Node* DataMerge_CopyContainer(CXFA_Node* pTemplateNode,
CXFA_Node* pFormNode,
CXFA_Node* pDataScope,
