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/formfiller/cffl_combobox.cpp | |
| 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/formfiller/cffl_combobox.cpp')
| -rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 69cc66bbc8..460fdce7ec 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -45,8 +45,9 @@ CPWL_Wnd::CreateParams CFFL_ComboBox::GetCreateParam() { } std::unique_ptr<CPWL_Wnd> CFFL_ComboBox::NewPDFWindow( - const CPWL_Wnd::CreateParams& cp) { - auto pWnd = pdfium::MakeUnique<CPWL_ComboBox>(); + const CPWL_Wnd::CreateParams& cp, + std::unique_ptr<CPWL_Wnd::PrivateData> pAttachedData) { + auto pWnd = pdfium::MakeUnique<CPWL_ComboBox>(std::move(pAttachedData)); pWnd->AttachFFLData(this); pWnd->Create(cp); |