Remove bool bPaint arguments from CPWL_EditImpl methods Split into "Set" and "SetAndPaint" variants. A subsequent CL may remove the "AndPaint" versions for better batching of paints. Change-Id: Ic95509c945b675c8e31124b0dd62acd48426c0d3 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/82250 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>

diff --git a/fpdfsdk/cpdfsdk_appstream.cpp b/fpdfsdk/cpdfsdk_appstream.cpp
index 2db422a..af7ab4d 100644
--- a/fpdfsdk/cpdfsdk_appstream.cpp
+++ b/fpdfsdk/cpdfsdk_appstream.cpp

@@ -741,12 +741,12 @@
 
   auto pEdit = std::make_unique<CPWL_EditImpl>();
   pEdit->SetFontMap(pFontMap);
-  pEdit->SetAlignmentH(1, true);
-  pEdit->SetAlignmentV(1, true);
-  pEdit->SetMultiLine(false, true);
-  pEdit->SetAutoReturn(false, true);
+  pEdit->SetAlignmentHAndPaint(1);
+  pEdit->SetAlignmentVAndPaint(1);
+  pEdit->SetMultiLineAndPaint(false);
+  pEdit->SetAutoReturnAndPaint(false);
   if (IsFloatZero(fFontSize))
-    pEdit->SetAutoFontSize(true, true);
+    pEdit->SetAutoFontSizeAndPaint(true);
   else
     pEdit->SetFontSizeAndPaint(fFontSize);
 
@@ -1541,11 +1541,11 @@
   rcEdit.Normalize();
 
   pEdit->SetPlateRectAndPaint(rcEdit);
-  pEdit->SetAlignmentV(1, true);
+  pEdit->SetAlignmentVAndPaint(1);
 
   float fFontSize = widget_->GetFontSize();
   if (IsFloatZero(fFontSize))
-    pEdit->SetAutoFontSize(true, true);
+    pEdit->SetAutoFontSizeAndPaint(true);
   else
     pEdit->SetFontSizeAndPaint(fFontSize);
 
@@ -1689,21 +1689,21 @@
 
   CFX_FloatRect rcClient = widget_->GetClientRect();
   pEdit->SetPlateRectAndPaint(rcClient);
-  pEdit->SetAlignmentH(pControl->GetControlAlignment(), true);
+  pEdit->SetAlignmentHAndPaint(pControl->GetControlAlignment());
 
   uint32_t dwFieldFlags = pField->GetFieldFlags();
   bool bMultiLine = dwFieldFlags & pdfium::form_flags::kTextMultiline;
   if (bMultiLine) {
-    pEdit->SetMultiLine(true, true);
-    pEdit->SetAutoReturn(true, true);
+    pEdit->SetMultiLineAndPaint(true);
+    pEdit->SetAutoReturnAndPaint(true);
   } else {
-    pEdit->SetAlignmentV(1, true);
+    pEdit->SetAlignmentVAndPaint(1);
   }
 
   uint16_t subWord = 0;
   if (dwFieldFlags & pdfium::form_flags::kTextPassword) {
     subWord = '*';
-    pEdit->SetPasswordChar(subWord, true);
+    pEdit->SetPasswordCharAndPaint(subWord);
   }
 
   int nMaxLen = pField->GetMaxLen();
@@ -1730,7 +1730,7 @@
   }
 
   if (IsFloatZero(fFontSize))
-    pEdit->SetAutoFontSize(true, true);
+    pEdit->SetAutoFontSizeAndPaint(true);
   else
     pEdit->SetFontSizeAndPaint(fFontSize);
 

diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index 03e853e..9fabac7 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp

@@ -84,7 +84,7 @@
 }
 
 void CPWL_Edit::SetAlignFormatVerticalCenter() {
-  m_pEditImpl->SetAlignmentV(static_cast<int32_t>(PEAV_CENTER), true);
+  m_pEditImpl->SetAlignmentVAndPaint(static_cast<int32_t>(PEAV_CENTER));
 }
 
 bool CPWL_Edit::CanSelectAll() const {
@@ -122,32 +122,32 @@
 
 void CPWL_Edit::SetParamByFlag() {
   if (HasFlag(PES_RIGHT)) {
-    m_pEditImpl->SetAlignmentH(2, false);
+    m_pEditImpl->SetAlignmentH(2);
   } else if (HasFlag(PES_MIDDLE)) {
-    m_pEditImpl->SetAlignmentH(1, false);
+    m_pEditImpl->SetAlignmentH(1);
   } else {
-    m_pEditImpl->SetAlignmentH(0, false);
+    m_pEditImpl->SetAlignmentH(0);
   }
 
   if (HasFlag(PES_CENTER)) {
-    m_pEditImpl->SetAlignmentV(1, false);
+    m_pEditImpl->SetAlignmentV(1);
   } else {
-    m_pEditImpl->SetAlignmentV(0, false);
+    m_pEditImpl->SetAlignmentV(0);
   }
 
   if (HasFlag(PES_PASSWORD)) {
-    m_pEditImpl->SetPasswordChar('*', false);
+    m_pEditImpl->SetPasswordChar('*');
   }
 
-  m_pEditImpl->SetMultiLine(HasFlag(PES_MULTILINE), false);
-  m_pEditImpl->SetAutoReturn(HasFlag(PES_AUTORETURN), false);
-  m_pEditImpl->SetAutoFontSize(HasFlag(PWS_AUTOFONTSIZE), false);
+  m_pEditImpl->SetMultiLine(HasFlag(PES_MULTILINE));
+  m_pEditImpl->SetAutoReturn(HasFlag(PES_AUTORETURN));
+  m_pEditImpl->SetAutoFontSize(HasFlag(PWS_AUTOFONTSIZE));
   m_pEditImpl->SetAutoScroll(HasFlag(PES_AUTOSCROLL));
   m_pEditImpl->EnableUndo(HasFlag(PES_UNDO));
 
   if (HasFlag(PES_TEXTOVERFLOW)) {
     SetClipRect(CFX_FloatRect());
-    m_pEditImpl->SetTextOverflow(true, false);
+    m_pEditImpl->SetTextOverflow(true);
   } else {
     if (m_pCaret) {
       CFX_FloatRect rect = GetClientRect();
@@ -298,7 +298,7 @@
     return;
 
   m_pEditImpl->SetCharArrayAndPaint(nCharArray);
-  m_pEditImpl->SetTextOverflow(true, true);
+  m_pEditImpl->SetTextOverflowAndPaint(true);
 
   if (!HasFlag(PWS_AUTOFONTSIZE))
     return;
@@ -312,7 +312,7 @@
   if (fFontSize <= 0.0f)
     return;
 
-  m_pEditImpl->SetAutoFontSize(false, true);
+  m_pEditImpl->SetAutoFontSizeAndPaint(false);
   m_pEditImpl->SetFontSizeAndPaint(fFontSize);
 }
 

diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
index af2de46..805472b 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp

@@ -727,22 +727,31 @@
   Paint();
 }
 
-void CPWL_EditImpl::SetAlignmentH(int32_t nFormat, bool bPaint) {
+void CPWL_EditImpl::SetAlignmentH(int32_t nFormat) {
   m_pVT->SetAlignment(nFormat);
-  if (bPaint)
-    Paint();
 }
 
-void CPWL_EditImpl::SetAlignmentV(int32_t nFormat, bool bPaint) {
+void CPWL_EditImpl::SetAlignmentHAndPaint(int32_t nFormat) {
+  SetAlignmentH(nFormat);
+  Paint();
+}
+
+void CPWL_EditImpl::SetAlignmentV(int32_t nFormat) {
   m_nAlignment = nFormat;
-  if (bPaint)
-    Paint();
 }
 
-void CPWL_EditImpl::SetPasswordChar(uint16_t wSubWord, bool bPaint) {
+void CPWL_EditImpl::SetAlignmentVAndPaint(int32_t nFormat) {
+  SetAlignmentV(nFormat);
+  Paint();
+}
+
+void CPWL_EditImpl::SetPasswordChar(uint16_t wSubWord) {
   m_pVT->SetPasswordChar(wSubWord);
-  if (bPaint)
-    Paint();
+}
+
+void CPWL_EditImpl::SetPasswordCharAndPaint(uint16_t wSubWord) {
+  SetPasswordChar(wSubWord);
+  Paint();
 }
 
 void CPWL_EditImpl::SetLimitCharAndPaint(int32_t nLimitChar) {
@@ -760,22 +769,31 @@
   Paint();
 }
 
-void CPWL_EditImpl::SetMultiLine(bool bMultiLine, bool bPaint) {
+void CPWL_EditImpl::SetMultiLine(bool bMultiLine) {
   m_pVT->SetMultiLine(bMultiLine);
-  if (bPaint)
-    Paint();
 }
 
-void CPWL_EditImpl::SetAutoReturn(bool bAuto, bool bPaint) {
+void CPWL_EditImpl::SetMultiLineAndPaint(bool bMultiLine) {
+  SetMultiLine(bMultiLine);
+  Paint();
+}
+
+void CPWL_EditImpl::SetAutoReturn(bool bAuto) {
   m_pVT->SetAutoReturn(bAuto);
-  if (bPaint)
-    Paint();
 }
 
-void CPWL_EditImpl::SetAutoFontSize(bool bAuto, bool bPaint) {
+void CPWL_EditImpl::SetAutoReturnAndPaint(bool bAuto) {
+  SetAutoReturn(bAuto);
+  Paint();
+}
+
+void CPWL_EditImpl::SetAutoFontSize(bool bAuto) {
   m_pVT->SetAutoFontSize(bAuto);
-  if (bPaint)
-    Paint();
+}
+
+void CPWL_EditImpl::SetAutoFontSizeAndPaint(bool bAuto) {
+  SetAutoFontSize(bAuto);
+  Paint();
 }
 
 void CPWL_EditImpl::SetFontSizeAndPaint(float fFontSize) {
@@ -787,10 +805,13 @@
   m_bEnableScroll = bAuto;
 }
 
-void CPWL_EditImpl::SetTextOverflow(bool bAllowed, bool bPaint) {
+void CPWL_EditImpl::SetTextOverflow(bool bAllowed) {
   m_bEnableOverflow = bAllowed;
-  if (bPaint)
-    Paint();
+}
+
+void CPWL_EditImpl::SetTextOverflowAndPaint(bool bAllowed) {
+  SetTextOverflow(bAllowed);
+  Paint();
 }
 
 void CPWL_EditImpl::SetSelection(int32_t nStartChar, int32_t nEndChar) {

diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index 040abfb..c04626c 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h

@@ -67,23 +67,31 @@
   void SetScrollPos(const CFX_PointF& point);
 
   // Set the horizontal text alignment. (nFormat [0:left, 1:middle, 2:right])
-  void SetAlignmentH(int32_t nFormat, bool bPaint);
+  void SetAlignmentH(int32_t nFormat);
+  void SetAlignmentHAndPaint(int32_t nFormat);
+
   // Set the vertical text alignment. (nFormat [0:left, 1:middle, 2:right])
-  void SetAlignmentV(int32_t nFormat, bool bPaint);
+  void SetAlignmentV(int32_t nFormat);
+  void SetAlignmentVAndPaint(int32_t nFormat);
 
   // Set the substitution character for hidden text.
-  void SetPasswordChar(uint16_t wSubWord, bool bPaint);
+  void SetPasswordChar(uint16_t wSubWord);
+  void SetPasswordCharAndPaint(uint16_t wSubWord);
 
   // Set the maximum number of words in the text.
   void SetLimitCharAndPaint(int32_t nLimitChar);
   void SetCharArrayAndPaint(int32_t nCharArray);
   void SetCharSpaceAndPaint(float fCharSpace);
-  void SetMultiLine(bool bMultiLine, bool bPaint);
-  void SetAutoReturn(bool bAuto, bool bPaint);
-  void SetAutoFontSize(bool bAuto, bool bPaint);
+  void SetMultiLine(bool bMultiLine);
+  void SetMultiLineAndPaint(bool bMultiLine);
+  void SetAutoReturn(bool bAuto);
+  void SetAutoReturnAndPaint(bool bAuto);
+  void SetAutoFontSize(bool bAuto);
+  void SetAutoFontSizeAndPaint(bool bAuto);
   void SetAutoScroll(bool bAuto);
   void SetFontSizeAndPaint(float fFontSize);
-  void SetTextOverflow(bool bAllowed, bool bPaint);
+  void SetTextOverflow(bool bAllowed);
+  void SetTextOverflowAndPaint(bool bAllowed);
   void OnMouseDown(const CFX_PointF& point, bool bShift, bool bCtrl);
   void OnMouseMove(const CFX_PointF& point, bool bShift, bool bCtrl);
   void OnVK_UP(bool bShift, bool bCtrl);

diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.cpp b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
index 5f06d46..3acf6f1 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.cpp

@@ -18,7 +18,7 @@
 CPWL_ListCtrl::NotifyIface::~NotifyIface() = default;
 
 CPWL_ListCtrl::Item::Item() : m_pEdit(std::make_unique<CPWL_EditImpl>()) {
-  m_pEdit->SetAlignmentV(1, true);
+  m_pEdit->SetAlignmentVAndPaint(1);
   m_pEdit->Initialize();
 }