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_wnd.cpp | |
| 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_wnd.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_wnd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.cpp b/fpdfsdk/pdfwindow/cpwl_wnd.cpp index 57e2643220..90a79305eb 100644 --- a/fpdfsdk/pdfwindow/cpwl_wnd.cpp +++ b/fpdfsdk/pdfwindow/cpwl_wnd.cpp @@ -186,6 +186,7 @@ void CPWL_Wnd::Destroy() { KillFocus(); OnDestroy(); if (m_bCreated) { + m_pVScrollBar = nullptr; for (auto it = m_Children.rbegin(); it != m_Children.rend(); ++it) { if (CPWL_Wnd* pChild = *it) { *it = nullptr; @@ -201,7 +202,6 @@ void CPWL_Wnd::Destroy() { DestroyMsgControl(); m_sPrivateParam.Reset(); m_Children.clear(); - m_pVScrollBar = nullptr; } void CPWL_Wnd::Move(const CFX_FloatRect& rcNew, bool bReset, bool bRefresh) { |