Remove CPWL_EditImpl "AndPaint" method variants.
Expand all calls exactly as-is. Arguably, this is making the code
worse, but this makes the problem visible so it can be corrected
in a subsequent cl.
Change-Id: I9bd6fb227751b279a990160d9cae453c7b37a9f4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/82251
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_appstream.cpp b/fpdfsdk/cpdfsdk_appstream.cpp
index af7ab4d..bdc6318 100644
--- a/fpdfsdk/cpdfsdk_appstream.cpp
+++ b/fpdfsdk/cpdfsdk_appstream.cpp
@@ -741,17 +741,24 @@
auto pEdit = std::make_unique<CPWL_EditImpl>();
pEdit->SetFontMap(pFontMap);
- pEdit->SetAlignmentHAndPaint(1);
- pEdit->SetAlignmentVAndPaint(1);
- pEdit->SetMultiLineAndPaint(false);
- pEdit->SetAutoReturnAndPaint(false);
- if (IsFloatZero(fFontSize))
- pEdit->SetAutoFontSizeAndPaint(true);
- else
- pEdit->SetFontSizeAndPaint(fFontSize);
-
+ pEdit->SetAlignmentH(1);
+ pEdit->Paint();
+ pEdit->SetAlignmentV(1);
+ pEdit->Paint();
+ pEdit->SetMultiLine(false);
+ pEdit->Paint();
+ pEdit->SetAutoReturn(false);
+ pEdit->Paint();
+ if (IsFloatZero(fFontSize)) {
+ pEdit->SetAutoFontSize(true);
+ pEdit->Paint();
+ } else {
+ pEdit->SetFontSize(fFontSize);
+ pEdit->Paint();
+ }
pEdit->Initialize();
- pEdit->SetTextAndPaint(sLabel);
+ pEdit->SetText(sLabel);
+ pEdit->Paint();
CFX_FloatRect rcLabelContent = pEdit->GetContentRect();
CFX_FloatRect rcLabel;
@@ -895,7 +902,8 @@
sTemp << GenerateIconAppStream(IconFit, pIconStream, rcIcon);
if (!rcLabel.IsEmpty()) {
- pEdit->SetPlateRectAndPaint(rcLabel);
+ pEdit->SetPlateRect(rcLabel);
+ pEdit->Paint();
ByteString sEdit =
GetEditAppStream(pEdit.get(), CFX_PointF(0.0f, 0.0f), true, 0);
if (sEdit.GetLength() > 0) {
@@ -1540,25 +1548,33 @@
rcEdit.right = rcButton.left;
rcEdit.Normalize();
- pEdit->SetPlateRectAndPaint(rcEdit);
- pEdit->SetAlignmentVAndPaint(1);
+ pEdit->SetPlateRect(rcEdit);
+ pEdit->Paint();
+ pEdit->SetAlignmentV(1);
+ pEdit->Paint();
float fFontSize = widget_->GetFontSize();
- if (IsFloatZero(fFontSize))
- pEdit->SetAutoFontSizeAndPaint(true);
- else
- pEdit->SetFontSizeAndPaint(fFontSize);
-
+ if (IsFloatZero(fFontSize)) {
+ pEdit->SetAutoFontSize(true);
+ pEdit->Paint();
+ } else {
+ pEdit->SetFontSize(fFontSize);
+ pEdit->Paint();
+ }
pEdit->Initialize();
if (sValue.has_value()) {
- pEdit->SetTextAndPaint(sValue.value());
+ pEdit->SetText(sValue.value());
+ pEdit->Paint();
} else {
int32_t nCurSel = pField->GetSelectedIndex(0);
- if (nCurSel < 0)
- pEdit->SetTextAndPaint(pField->GetValue());
- else
- pEdit->SetTextAndPaint(pField->GetOptionLabel(nCurSel));
+ if (nCurSel < 0) {
+ pEdit->SetText(pField->GetValue());
+ pEdit->Paint();
+ } else {
+ pEdit->SetText(pField->GetOptionLabel(nCurSel));
+ pEdit->Paint();
+ }
}
CFX_FloatRect rcContent = pEdit->GetContentRect();
@@ -1601,11 +1617,12 @@
auto pEdit = std::make_unique<CPWL_EditImpl>();
pEdit->EnableRefresh(false);
pEdit->SetFontMap(&font_map);
- pEdit->SetPlateRectAndPaint(
- CFX_FloatRect(rcClient.left, 0.0f, rcClient.right, 0.0f));
+ pEdit->SetPlateRect(CFX_FloatRect(rcClient.left, 0.0f, rcClient.right, 0.0f));
+ pEdit->Paint();
float fFontSize = widget_->GetFontSize();
- pEdit->SetFontSizeAndPaint(IsFloatZero(fFontSize) ? 12.0f : fFontSize);
+ pEdit->SetFontSize(IsFloatZero(fFontSize) ? 12.0f : fFontSize);
+ pEdit->Paint();
pEdit->Initialize();
std::ostringstream sList;
@@ -1624,7 +1641,8 @@
}
}
- pEdit->SetTextAndPaint(pField->GetOptionLabel(i));
+ pEdit->SetText(pField->GetOptionLabel(i));
+ pEdit->Paint();
CFX_FloatRect rcContent = pEdit->GetContentRect();
float fItemHeight = rcContent.Height();
@@ -1688,22 +1706,28 @@
pEdit->SetFontMap(&font_map);
CFX_FloatRect rcClient = widget_->GetClientRect();
- pEdit->SetPlateRectAndPaint(rcClient);
- pEdit->SetAlignmentHAndPaint(pControl->GetControlAlignment());
+ pEdit->SetPlateRect(rcClient);
+ pEdit->Paint();
+ pEdit->SetAlignmentH(pControl->GetControlAlignment());
+ pEdit->Paint();
uint32_t dwFieldFlags = pField->GetFieldFlags();
bool bMultiLine = dwFieldFlags & pdfium::form_flags::kTextMultiline;
if (bMultiLine) {
- pEdit->SetMultiLineAndPaint(true);
- pEdit->SetAutoReturnAndPaint(true);
+ pEdit->SetMultiLine(true);
+ pEdit->Paint();
+ pEdit->SetAutoReturn(true);
+ pEdit->Paint();
} else {
- pEdit->SetAlignmentVAndPaint(1);
+ pEdit->SetAlignmentV(1);
+ pEdit->Paint();
}
uint16_t subWord = 0;
if (dwFieldFlags & pdfium::form_flags::kTextPassword) {
subWord = '*';
- pEdit->SetPasswordCharAndPaint(subWord);
+ pEdit->SetPasswordChar(subWord);
+ pEdit->Paint();
}
int nMaxLen = pField->GetMaxLen();
@@ -1717,7 +1741,8 @@
if (nMaxLen > 0) {
if (bCharArray) {
- pEdit->SetCharArrayAndPaint(nMaxLen);
+ pEdit->SetCharArray(nMaxLen);
+ pEdit->Paint();
if (IsFloatZero(fFontSize)) {
fFontSize = CPWL_Edit::GetCharArrayAutoFontSize(
font_map.GetPDFFont(0).Get(), rcClient, nMaxLen);
@@ -1725,17 +1750,21 @@
} else {
if (sValue.has_value())
nMaxLen = sValue.value().GetLength();
- pEdit->SetLimitCharAndPaint(nMaxLen);
+ pEdit->SetLimitChar(nMaxLen);
+ pEdit->Paint();
}
}
- if (IsFloatZero(fFontSize))
- pEdit->SetAutoFontSizeAndPaint(true);
- else
- pEdit->SetFontSizeAndPaint(fFontSize);
-
+ if (IsFloatZero(fFontSize)) {
+ pEdit->SetAutoFontSize(true);
+ pEdit->Paint();
+ } else {
+ pEdit->SetFontSize(fFontSize);
+ pEdit->Paint();
+ }
pEdit->Initialize();
- pEdit->SetTextAndPaint(sValue.value_or(pField->GetValue()));
+ pEdit->SetText(sValue.value_or(pField->GetValue()));
+ pEdit->Paint();
CFX_FloatRect rcContent = pEdit->GetContentRect();
ByteString sEdit =
diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index 9fabac7..db2ec9c 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -41,7 +41,8 @@
}
void CPWL_Edit::SetText(const WideString& csText) {
- m_pEditImpl->SetTextAndPaint(csText);
+ m_pEditImpl->SetText(csText);
+ m_pEditImpl->Paint();
}
bool CPWL_Edit::RePosChildWnd() {
@@ -67,7 +68,8 @@
m_pCaret->SetClipRect(rect);
}
- m_pEditImpl->SetPlateRectAndPaint(GetClientRect());
+ m_pEditImpl->SetPlateRect(GetClientRect());
+ m_pEditImpl->Paint();
return true;
}
@@ -84,7 +86,8 @@
}
void CPWL_Edit::SetAlignFormatVerticalCenter() {
- m_pEditImpl->SetAlignmentVAndPaint(static_cast<int32_t>(PEAV_CENTER));
+ m_pEditImpl->SetAlignmentV(static_cast<int32_t>(PEAV_CENTER));
+ m_pEditImpl->Paint();
}
bool CPWL_Edit::CanSelectAll() const {
@@ -258,7 +261,8 @@
}
void CPWL_Edit::SetCharSpace(float fCharSpace) {
- m_pEditImpl->SetCharSpaceAndPaint(fCharSpace);
+ m_pEditImpl->SetCharSpace(fCharSpace);
+ m_pEditImpl->Paint();
}
CPVT_WordRange CPWL_Edit::GetSelectWordRange() const {
@@ -297,8 +301,10 @@
if (!HasFlag(PES_CHARARRAY) || nCharArray <= 0)
return;
- m_pEditImpl->SetCharArrayAndPaint(nCharArray);
- m_pEditImpl->SetTextOverflowAndPaint(true);
+ m_pEditImpl->SetCharArray(nCharArray);
+ m_pEditImpl->Paint();
+ m_pEditImpl->SetTextOverflow(true);
+ m_pEditImpl->Paint();
if (!HasFlag(PWS_AUTOFONTSIZE))
return;
@@ -312,12 +318,15 @@
if (fFontSize <= 0.0f)
return;
- m_pEditImpl->SetAutoFontSizeAndPaint(false);
- m_pEditImpl->SetFontSizeAndPaint(fFontSize);
+ m_pEditImpl->SetAutoFontSize(false);
+ m_pEditImpl->Paint();
+ m_pEditImpl->SetFontSize(fFontSize);
+ m_pEditImpl->Paint();
}
void CPWL_Edit::SetLimitChar(int32_t nLimitChar) {
- m_pEditImpl->SetLimitCharAndPaint(nLimitChar);
+ m_pEditImpl->SetLimitChar(nLimitChar);
+ m_pEditImpl->Paint();
}
CFX_FloatRect CPWL_Edit::GetFocusRect() const {
@@ -539,7 +548,8 @@
}
void CPWL_Edit::SetFontSize(float fFontSize) {
- m_pEditImpl->SetFontSizeAndPaint(fFontSize);
+ m_pEditImpl->SetFontSize(fFontSize);
+ m_pEditImpl->Paint();
}
float CPWL_Edit::GetFontSize() const {
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
index 805472b..a696776 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp
@@ -721,84 +721,49 @@
return m_pVTProvider ? m_pVTProvider->GetFontMap() : nullptr;
}
-void CPWL_EditImpl::SetPlateRectAndPaint(const CFX_FloatRect& rect) {
+void CPWL_EditImpl::SetPlateRect(const CFX_FloatRect& rect) {
m_pVT->SetPlateRect(rect);
m_ptScrollPos = CFX_PointF(rect.left, rect.top);
- Paint();
}
void CPWL_EditImpl::SetAlignmentH(int32_t nFormat) {
m_pVT->SetAlignment(nFormat);
}
-void CPWL_EditImpl::SetAlignmentHAndPaint(int32_t nFormat) {
- SetAlignmentH(nFormat);
- Paint();
-}
-
void CPWL_EditImpl::SetAlignmentV(int32_t nFormat) {
m_nAlignment = nFormat;
}
-void CPWL_EditImpl::SetAlignmentVAndPaint(int32_t nFormat) {
- SetAlignmentV(nFormat);
- Paint();
-}
-
void CPWL_EditImpl::SetPasswordChar(uint16_t wSubWord) {
m_pVT->SetPasswordChar(wSubWord);
}
-void CPWL_EditImpl::SetPasswordCharAndPaint(uint16_t wSubWord) {
- SetPasswordChar(wSubWord);
- Paint();
-}
-
-void CPWL_EditImpl::SetLimitCharAndPaint(int32_t nLimitChar) {
+void CPWL_EditImpl::SetLimitChar(int32_t nLimitChar) {
m_pVT->SetLimitChar(nLimitChar);
- Paint();
}
-void CPWL_EditImpl::SetCharArrayAndPaint(int32_t nCharArray) {
+void CPWL_EditImpl::SetCharArray(int32_t nCharArray) {
m_pVT->SetCharArray(nCharArray);
- Paint();
}
-void CPWL_EditImpl::SetCharSpaceAndPaint(float fCharSpace) {
+void CPWL_EditImpl::SetCharSpace(float fCharSpace) {
m_pVT->SetCharSpace(fCharSpace);
- Paint();
}
void CPWL_EditImpl::SetMultiLine(bool bMultiLine) {
m_pVT->SetMultiLine(bMultiLine);
}
-void CPWL_EditImpl::SetMultiLineAndPaint(bool bMultiLine) {
- SetMultiLine(bMultiLine);
- Paint();
-}
-
void CPWL_EditImpl::SetAutoReturn(bool bAuto) {
m_pVT->SetAutoReturn(bAuto);
}
-void CPWL_EditImpl::SetAutoReturnAndPaint(bool bAuto) {
- SetAutoReturn(bAuto);
- Paint();
-}
-
void CPWL_EditImpl::SetAutoFontSize(bool bAuto) {
m_pVT->SetAutoFontSize(bAuto);
}
-void CPWL_EditImpl::SetAutoFontSizeAndPaint(bool bAuto) {
- SetAutoFontSize(bAuto);
- Paint();
-}
-
-void CPWL_EditImpl::SetFontSizeAndPaint(float fFontSize) {
+void CPWL_EditImpl::SetFontSize(float fFontSize) {
m_pVT->SetFontSize(fFontSize);
- Paint();
}
void CPWL_EditImpl::SetAutoScroll(bool bAuto) {
@@ -809,11 +774,6 @@
m_bEnableOverflow = bAllowed;
}
-void CPWL_EditImpl::SetTextOverflowAndPaint(bool bAllowed) {
- SetTextOverflow(bAllowed);
- Paint();
-}
-
void CPWL_EditImpl::SetSelection(int32_t nStartChar, int32_t nEndChar) {
if (m_pVT->IsValid()) {
if (nStartChar == 0 && nEndChar < 0) {
@@ -939,10 +899,9 @@
return m_SelState.ConvertToWordRange();
}
-void CPWL_EditImpl::SetTextAndPaint(const WideString& sText) {
+void CPWL_EditImpl::SetText(const WideString& sText) {
Clear();
DoInsertText(CPVT_WordPlace(0, 0, -1), sText, FX_CHARSET_Default);
- Paint();
}
bool CPWL_EditImpl::InsertWord(uint16_t word, int32_t charset) {
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index c04626c..ee0b4d7 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -63,35 +63,28 @@
void Initialize();
// Set the bounding box of the text area.
- void SetPlateRectAndPaint(const CFX_FloatRect& rect);
+ void SetPlateRect(const CFX_FloatRect& rect);
void SetScrollPos(const CFX_PointF& point);
// Set the horizontal text alignment. (nFormat [0:left, 1:middle, 2:right])
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);
- void SetAlignmentVAndPaint(int32_t nFormat);
// Set the substitution character for hidden text.
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 SetLimitChar(int32_t nLimitChar);
+ void SetCharArray(int32_t nCharArray);
+ void SetCharSpace(float fCharSpace);
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 SetFontSize(float fFontSize);
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);
@@ -100,7 +93,7 @@
void OnVK_RIGHT(bool bShift, bool bCtrl);
void OnVK_HOME(bool bShift, bool bCtrl);
void OnVK_END(bool bShift, bool bCtrl);
- void SetTextAndPaint(const WideString& sText);
+ void SetText(const WideString& sText);
bool InsertWord(uint16_t word, int32_t charset);
bool InsertReturn();
bool Backspace();
diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.cpp b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
index 3acf6f1..74a4603 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
@@ -18,7 +18,8 @@
CPWL_ListCtrl::NotifyIface::~NotifyIface() = default;
CPWL_ListCtrl::Item::Item() : m_pEdit(std::make_unique<CPWL_EditImpl>()) {
- m_pEdit->SetAlignmentVAndPaint(1);
+ m_pEdit->SetAlignmentV(1);
+ m_pEdit->Paint();
m_pEdit->Initialize();
}
@@ -29,11 +30,13 @@
}
void CPWL_ListCtrl::Item::SetText(const WideString& text) {
- m_pEdit->SetTextAndPaint(text);
+ m_pEdit->SetText(text);
+ m_pEdit->Paint();
}
void CPWL_ListCtrl::Item::SetFontSize(float fFontSize) {
- m_pEdit->SetFontSizeAndPaint(fFontSize);
+ m_pEdit->SetFontSize(fFontSize);
+ m_pEdit->Paint();
}
float CPWL_ListCtrl::Item::GetItemHeight() const {
