diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-10-25 23:25:58 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-25 23:25:58 +0000 |
commit | 6fe32f898af3eea875fd01a6d18f719d17dd72f3 (patch) | |
tree | f63a1a03d3fffc3e4e765442df9805b526660765 /fpdfsdk/pwl/cpwl_combo_box.h | |
parent | ed7da31f67e93c8923669ad496126aa005a8d3a2 (diff) | |
download | pdfium-6fe32f898af3eea875fd01a6d18f719d17dd72f3.tar.xz |
Make CPWL_Wnd own its pAttachedData.
This requires moving it out of CreateParams, since that must be
a copyable struct, and implies that currently there is some
questionable sharing going on. To resolve this, introduce a
Clone() method so that each window gets its own copy.
Make GetAttachedData() return a const pointer, so that callers
can't free it behind our back.
Tidy initializations along the way.
Change-Id: Iadc97688b4692bf4fafefe8cff88af88672f7110
Reviewed-on: https://pdfium-review.googlesource.com/c/44590
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_combo_box.h')
-rw-r--r-- | fpdfsdk/pwl/cpwl_combo_box.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h index 2e66b515b0..e3a3ff38ca 100644 --- a/fpdfsdk/pwl/cpwl_combo_box.h +++ b/fpdfsdk/pwl/cpwl_combo_box.h @@ -7,6 +7,8 @@ #ifndef FPDFSDK_PWL_CPWL_COMBO_BOX_H_ #define FPDFSDK_PWL_CPWL_COMBO_BOX_H_ +#include <memory> + #include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_edit.h" #include "fpdfsdk/pwl/cpwl_list_box.h" @@ -14,8 +16,8 @@ class CPWL_CBListBox final : public CPWL_ListBox { public: - CPWL_CBListBox() {} - ~CPWL_CBListBox() override {} + explicit CPWL_CBListBox(std::unique_ptr<PrivateData> pAttachedData); + ~CPWL_CBListBox() override; // CPWL_ListBox bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override; @@ -28,8 +30,8 @@ class CPWL_CBListBox final : public CPWL_ListBox { class CPWL_CBButton final : public CPWL_Wnd { public: - CPWL_CBButton() {} - ~CPWL_CBButton() override {} + explicit CPWL_CBButton(std::unique_ptr<PrivateData> pAttachedData); + ~CPWL_CBButton() override; // CPWL_Wnd void DrawThisAppearance(CFX_RenderDevice* pDevice, @@ -40,7 +42,7 @@ class CPWL_CBButton final : public CPWL_Wnd { class CPWL_ComboBox final : public CPWL_Wnd { public: - CPWL_ComboBox(); + explicit CPWL_ComboBox(std::unique_ptr<PrivateData> pAttachedData); ~CPWL_ComboBox() override; CPWL_Edit* GetEdit() const { return m_pEdit.Get(); } @@ -77,9 +79,7 @@ class CPWL_ComboBox final : public CPWL_Wnd { void ClearSelection(); void SelectAll(); bool IsPopup() const; - void SetSelectText(); - void AttachFFLData(CFFL_FormFiller* pData) { m_pFormFiller = pData; } private: |