diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-08-21 23:10:51 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-21 23:10:51 +0000 |
commit | ae386367e8c0475fd5bcbacb9baa557409afb9c6 (patch) | |
tree | 0363fab846c6bbcbfb0c3f66d1988b4906f07b3e /fpdfsdk/pwl/cpwl_edit_impl.h | |
parent | bcdbeaea96d53800ee806f463108f54f79a19347 (diff) | |
download | pdfium-ae386367e8c0475fd5bcbacb9baa557409afb9c6.tar.xz |
Use UnownedPtr in CPDF_VariableText
Re-arrange order of some variables so that the lifetime
constraints are not violated, even temporarilly.
Change-Id: I859f1217d5af0f4c703a3d8ed742c1f144cc1c61
Reviewed-on: https://pdfium-review.googlesource.com/40950
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_edit_impl.h')
-rw-r--r-- | fpdfsdk/pwl/cpwl_edit_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h index 7f4d3e108b..8680885e63 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.h +++ b/fpdfsdk/pwl/cpwl_edit_impl.h @@ -374,10 +374,10 @@ class CPWL_EditImpl { void AddEditUndoItem(std::unique_ptr<IFX_Edit_UndoItem> pEditUndoItem); - std::unique_ptr<CPDF_VariableText> m_pVT; + std::unique_ptr<CPWL_EditImpl_Provider> m_pVTProvider; + std::unique_ptr<CPDF_VariableText> m_pVT; // Must outlive |m_pVTProvider|. UnownedPtr<CPWL_EditCtrl> m_pNotify; UnownedPtr<CPWL_Edit> m_pOperationNotify; - std::unique_ptr<CPWL_EditImpl_Provider> m_pVTProvider; CPVT_WordPlace m_wpCaret; CPVT_WordPlace m_wpOldCaret; CPWL_EditImpl_Select m_SelState; |