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.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/pwl/cpwl_icon.cpp')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_icon.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/pwl/cpwl_icon.cpp b/fpdfsdk/pwl/cpwl_icon.cpp index 407e866766..8d672f58da 100644 --- a/fpdfsdk/pwl/cpwl_icon.cpp +++ b/fpdfsdk/pwl/cpwl_icon.cpp @@ -8,15 +8,17 @@ #include <algorithm> #include <sstream> +#include <utility> #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "fpdfsdk/pwl/cpwl_wnd.h" -CPWL_Icon::CPWL_Icon() : m_pPDFStream(nullptr), m_pIconFit(nullptr) {} +CPWL_Icon::CPWL_Icon(std::unique_ptr<PrivateData> pAttachedData) + : CPWL_Wnd(std::move(pAttachedData)) {} -CPWL_Icon::~CPWL_Icon() {} +CPWL_Icon::~CPWL_Icon() = default; std::pair<float, float> CPWL_Icon::GetImageSize() { if (!m_pPDFStream) |