Initialize CPWL_ListCtrl in the header.
Along the way, rearrange the members to pack better.
Change-Id: Ib2f3bc6953cb9e559b5f3f3ef271d032aa33b70e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70921
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/pwl/cpwl_list_impl.cpp b/fpdfsdk/pwl/cpwl_list_impl.cpp
index f8784f4..cf4deb0 100644
--- a/fpdfsdk/pwl/cpwl_list_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_impl.cpp
@@ -95,16 +95,7 @@
}
}
-CPWL_ListCtrl::CPWL_ListCtrl()
- : m_pNotify(nullptr),
- m_bNotifyFlag(false),
- m_nSelItem(-1),
- m_nFootIndex(-1),
- m_bCtrlSel(false),
- m_nCaretIndex(-1),
- m_fFontSize(0.0f),
- m_pFontMap(nullptr),
- m_bMultiple(false) {}
+CPWL_ListCtrl::CPWL_ListCtrl() = default;
CPWL_ListCtrl::~CPWL_ListCtrl() {
Clear();
diff --git a/fpdfsdk/pwl/cpwl_list_impl.h b/fpdfsdk/pwl/cpwl_list_impl.h
index c7a86ab..4b20623 100644
--- a/fpdfsdk/pwl/cpwl_list_impl.h
+++ b/fpdfsdk/pwl/cpwl_list_impl.h
@@ -153,18 +153,23 @@
CFX_FloatRect m_rcPlate;
CFX_FloatRect m_rcContent;
- UnownedPtr<CPWL_List_Notify> m_pNotify;
- bool m_bNotifyFlag;
CFX_PointF m_ptScrollPos;
- CPLST_Select m_aSelItems; // for multiple
- int32_t m_nSelItem; // for single
- int32_t m_nFootIndex; // for multiple
- bool m_bCtrlSel; // for multiple
- int32_t m_nCaretIndex; // for multiple
+ float m_fFontSize = 0.0f;
+
+ // For single:
+ int32_t m_nSelItem = -1;
+
+ // For multiple:
+ CPLST_Select m_aSelItems;
+ int32_t m_nFootIndex = -1;
+ int32_t m_nCaretIndex = -1;
+ bool m_bCtrlSel = false;
+
+ bool m_bMultiple = false;
+ bool m_bNotifyFlag = false;
+ UnownedPtr<CPWL_List_Notify> m_pNotify;
std::vector<std::unique_ptr<Item>> m_ListItems;
- float m_fFontSize;
UnownedPtr<IPVT_FontMap> m_pFontMap;
- bool m_bMultiple;
};
#endif // FPDFSDK_PWL_CPWL_LIST_IMPL_H_