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_edit.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_edit.h')
-rw-r--r-- | fpdfsdk/pwl/cpwl_edit.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h index d890834aac..c996437dd1 100644 --- a/fpdfsdk/pwl/cpwl_edit.h +++ b/fpdfsdk/pwl/cpwl_edit.h @@ -7,6 +7,7 @@ #ifndef FPDFSDK_PWL_CPWL_EDIT_H_ #define FPDFSDK_PWL_CPWL_EDIT_H_ +#include <memory> #include <utility> #include "core/fpdfdoc/cpvt_wordrange.h" @@ -18,30 +19,31 @@ class IPWL_Filler_Notify { virtual ~IPWL_Filler_Notify() = default; // Must write to |bBottom| and |fPopupRet|. - virtual void QueryWherePopup(CPWL_Wnd::PrivateData* pAttached, + virtual void QueryWherePopup(const CPWL_Wnd::PrivateData* pAttached, float fPopupMin, float fPopupMax, bool* bBottom, float* fPopupRet) = 0; virtual std::pair<bool, bool> OnBeforeKeyStroke( - CPWL_Wnd::PrivateData* pAttached, + const CPWL_Wnd::PrivateData* pAttached, WideString& strChange, const WideString& strChangeEx, int nSelStart, int nSelEnd, bool bKeyDown, uint32_t nFlag) = 0; + #ifdef PDF_ENABLE_XFA - virtual bool OnPopupPreOpen(CPWL_Wnd::PrivateData* pAttached, + virtual bool OnPopupPreOpen(const CPWL_Wnd::PrivateData* pAttached, uint32_t nFlag) = 0; - virtual bool OnPopupPostOpen(CPWL_Wnd::PrivateData* pAttached, + virtual bool OnPopupPostOpen(const CPWL_Wnd::PrivateData* pAttached, uint32_t nFlag) = 0; #endif // PDF_ENABLE_XFA }; class CPWL_Edit final : public CPWL_EditCtrl { public: - CPWL_Edit(); + explicit CPWL_Edit(std::unique_ptr<PrivateData> pAttachedData); ~CPWL_Edit() override; // CPWL_EditCtrl @@ -118,7 +120,7 @@ class CPWL_Edit final : public CPWL_EditCtrl { bool bLatin, bool bArabic) const; - bool m_bFocus; + bool m_bFocus = false; CFX_FloatRect m_rcOldWindow; UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; UnownedPtr<CFFL_FormFiller> m_pFormFiller; |