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_formfiller.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/formfiller/cffl_formfiller.h')
| -rw-r--r-- | fpdfsdk/formfiller/cffl_formfiller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index a6f7cdc78f..6b04e0c936 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -93,7 +93,7 @@ class CFFL_FormFiller : public CPWL_Wnd::ProviderIface, CFX_SystemHandler* GetSystemHandler() const override; // CPWL_Wnd::ProviderIface: - CFX_Matrix GetWindowMatrix(CPWL_Wnd::PrivateData* pAttached) override; + CFX_Matrix GetWindowMatrix(const CPWL_Wnd::PrivateData* pAttached) override; virtual void GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, @@ -107,7 +107,8 @@ class CFFL_FormFiller : public CPWL_Wnd::ProviderIface, virtual CPWL_Wnd::CreateParams GetCreateParam(); virtual std::unique_ptr<CPWL_Wnd> NewPDFWindow( - const CPWL_Wnd::CreateParams& cp) = 0; + const CPWL_Wnd::CreateParams& cp, + std::unique_ptr<CPWL_Wnd::PrivateData> pAttachedData) = 0; virtual CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView, bool bRestoreValue); virtual void SaveState(CPDFSDK_PageView* pPageView); |