diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-06-09 01:04:52 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-06-13 16:41:09 +0000 |
| commit | 3516256c28c29d13e9092e7bb3ea3b417d3bb6df (patch) | |
| tree | 543765e8a5a5376d4dcdd7bfcc464d2c0fe88c7f /fpdfsdk/pdfwindow/cpwl_combo_box.h | |
| parent | 19e6bcffdbf88cf2413699e6cfbd493ca3cba0a8 (diff) | |
| download | pdfium-3516256c28c29d13e9092e7bb3ea3b417d3bb6df.tar.xz | |
Implement CPWL_ComboBox::OnDestroy() to manage unowned pointers.
CPWL_ComboBox's unowned pointers to other CPWL_Wnds need to be released
at the right time. Also release the unowned pointer for CPWL_Wnd's
vertical scroll bar at the right time.
BUG=729041
Change-Id: I06a1da35fcb18dae8faf9cd4fbc0b75d38f115b0
Reviewed-on: https://pdfium-review.googlesource.com/6418
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/cpwl_combo_box.h')
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_combo_box.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.h b/fpdfsdk/pdfwindow/cpwl_combo_box.h index 71bd1a9e1c..e814ca5d40 100644 --- a/fpdfsdk/pdfwindow/cpwl_combo_box.h +++ b/fpdfsdk/pdfwindow/cpwl_combo_box.h @@ -57,6 +57,7 @@ class CPWL_ComboBox : public CPWL_Wnd { // CPWL_Wnd: CFX_ByteString GetClassName() const override; void OnCreate(PWL_CREATEPARAM& cp) override; + void OnDestroy() override; bool OnKeyDown(uint16_t nChar, uint32_t nFlag) override; bool OnChar(uint16_t nChar, uint32_t nFlag) override; void OnNotify(CPWL_Wnd* pWnd, @@ -97,9 +98,9 @@ class CPWL_ComboBox : public CPWL_Wnd { CFX_UnownedPtr<CPWL_CBButton> m_pButton; CFX_UnownedPtr<CPWL_CBListBox> m_pList; CFX_FloatRect m_rcOldWindow; - bool m_bPopup; - bool m_bBottom; - int32_t m_nSelectItem; + bool m_bPopup = false; + bool m_bBottom = true; + int32_t m_nSelectItem = -1; CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller; }; |