Pass rect by const-ref to CPWL_ListCtrl::NotifyIface::OnInvalidateRect()
Follow-up item from review at
https://pdfium-review.googlesource.com/c/pdfium/+/75110
Change-Id: Ib22ea54f4e292e61c9d88c976f57ff3db6023000
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75153
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/pwl/cpwl_caret.cpp b/fpdfsdk/pwl/cpwl_caret.cpp
index 2d05512..50eafe9 100644
--- a/fpdfsdk/pwl/cpwl_caret.cpp
+++ b/fpdfsdk/pwl/cpwl_caret.cpp
@@ -109,10 +109,9 @@
// needs to be done, check the return value of Move().
}
-bool CPWL_Caret::InvalidateRect(CFX_FloatRect* pRect) {
- if (!pRect) {
+bool CPWL_Caret::InvalidateRect(const CFX_FloatRect* pRect) {
+ if (!pRect)
return CPWL_Wnd::InvalidateRect(nullptr);
- }
CFX_FloatRect rcRefresh = *pRect;
if (!rcRefresh.IsEmpty()) {
diff --git a/fpdfsdk/pwl/cpwl_caret.h b/fpdfsdk/pwl/cpwl_caret.h
index 71788ef..015c511 100644
--- a/fpdfsdk/pwl/cpwl_caret.h
+++ b/fpdfsdk/pwl/cpwl_caret.h
@@ -21,7 +21,7 @@
// CPWL_Wnd:
void DrawThisAppearance(CFX_RenderDevice* pDevice,
const CFX_Matrix& mtUser2Device) override;
- bool InvalidateRect(CFX_FloatRect* pRect) override;
+ bool InvalidateRect(const CFX_FloatRect* pRect) override;
bool SetVisible(bool bVisible) override;
// CFX_Timer::CallbackIface:
diff --git a/fpdfsdk/pwl/cpwl_list_box.cpp b/fpdfsdk/pwl/cpwl_list_box.cpp
index ca5adde..8040ba5 100644
--- a/fpdfsdk/pwl/cpwl_list_box.cpp
+++ b/fpdfsdk/pwl/cpwl_list_box.cpp
@@ -286,8 +286,8 @@
SetScrollPosition(fy);
}
-void CPWL_ListBox::OnInvalidateRect(CFX_FloatRect* pRect) {
- InvalidateRect(pRect);
+void CPWL_ListBox::OnInvalidateRect(const CFX_FloatRect& rect) {
+ InvalidateRect(&rect);
}
void CPWL_ListBox::Select(int32_t nItemIndex) {
diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
index b3dc594..8198d06 100644
--- a/fpdfsdk/pwl/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -53,7 +53,7 @@
float fSmallStep,
float fBigStep) override;
void OnSetScrollPosY(float fy) override;
- void OnInvalidateRect(CFX_FloatRect* pRect) override;
+ void OnInvalidateRect(const CFX_FloatRect& pRect) override;
bool OnNotifySelectionChanged(bool bKeyDown, uint32_t nFlag);
diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.cpp b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
index f2f00f7..9d17299 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.cpp
@@ -357,7 +357,7 @@
if (!m_bNotifyFlag) {
m_bNotifyFlag = true;
CFX_FloatRect rcRefresh = m_rcPlate;
- m_pNotify->OnInvalidateRect(&rcRefresh);
+ m_pNotify->OnInvalidateRect(rcRefresh);
m_bNotifyFlag = false;
}
} else {
@@ -369,7 +369,7 @@
rcRefresh.bottom -= 1.0f;
rcRefresh.top += 1.0f;
- m_pNotify->OnInvalidateRect(&rcRefresh);
+ m_pNotify->OnInvalidateRect(rcRefresh);
m_bNotifyFlag = false;
}
}
diff --git a/fpdfsdk/pwl/cpwl_list_ctrl.h b/fpdfsdk/pwl/cpwl_list_ctrl.h
index a8ab093..16bb725 100644
--- a/fpdfsdk/pwl/cpwl_list_ctrl.h
+++ b/fpdfsdk/pwl/cpwl_list_ctrl.h
@@ -33,7 +33,7 @@
float fSmallStep,
float fBigStep) = 0;
virtual void OnSetScrollPosY(float fy) = 0;
- virtual void OnInvalidateRect(CFX_FloatRect* pRect) = 0;
+ virtual void OnInvalidateRect(const CFX_FloatRect& rect) = 0;
};
CPWL_ListCtrl();
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 1d031f0..e14ba36 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -249,7 +249,7 @@
}
}
-bool CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
+bool CPWL_Wnd::InvalidateRect(const CFX_FloatRect* pRect) {
if (!IsValid())
return true;
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index 8412f0a..43b535e 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -144,7 +144,7 @@
virtual ~CPWL_Wnd();
// Returns |true| iff this instance is still allocated.
- virtual bool InvalidateRect(CFX_FloatRect* pRect);
+ virtual bool InvalidateRect(const CFX_FloatRect* pRect);
virtual bool OnKeyDown(uint16_t nChar, uint32_t nFlag);
virtual bool OnChar(uint16_t nChar, uint32_t nFlag);