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_icon.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_icon.h')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_icon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fpdfsdk/pwl/cpwl_icon.h b/fpdfsdk/pwl/cpwl_icon.h index 2cb84ebcf6..83709f7e18 100644 --- a/fpdfsdk/pwl/cpwl_icon.h +++ b/fpdfsdk/pwl/cpwl_icon.h @@ -7,6 +7,7 @@ #ifndef FPDFSDK_PWL_CPWL_ICON_H_ #define FPDFSDK_PWL_CPWL_ICON_H_ +#include <memory> #include <utility> #include "core/fxcrt/fx_string.h" @@ -15,7 +16,7 @@ class CPWL_Icon final : public CPWL_Wnd { public: - CPWL_Icon(); + explicit CPWL_Icon(std::unique_ptr<PrivateData> pAttachedData); ~CPWL_Icon() override; void SetIconFit(CPDF_IconFit* pIconFit) { m_pIconFit = pIconFit; } |