From 30f739c81db8d6fb4cb68347eae6b2a785cd6414 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 17 May 2018 18:30:32 +0000 Subject: Make CXFA_LayoutProcessor an UnownedPtr in CXFA_FFDocView The LayoutProcessor is owned by the CXFA_Document. Make the ownership explicit with an UnownedPtr. Change-Id: I100af9e2e029e0a5db4ee365e11977016ffdcd70 Reviewed-on: https://pdfium-review.googlesource.com/32670 Commit-Queue: dsinclair Reviewed-by: Henrique Nakashima --- xfa/fxfa/cxfa_ffdocview.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/cxfa_ffdocview.h b/xfa/fxfa/cxfa_ffdocview.h index 2b8358264c..efa504ecd3 100644 --- a/xfa/fxfa/cxfa_ffdocview.h +++ b/xfa/fxfa/cxfa_ffdocview.h @@ -97,6 +97,8 @@ class CXFA_FFDocView { bool m_bInLayoutStatus = false; std::vector m_arrNullTestMsg; + void ResetLayoutProcessor() { m_pXFADocLayout.Release(); } + private: bool RunEventLayoutReady(); void RunBindItems(); @@ -115,7 +117,7 @@ class CXFA_FFDocView { UnownedPtr const m_pDoc; std::unique_ptr m_pWidgetHandler; - CXFA_LayoutProcessor* m_pXFADocLayout = nullptr; // Not owned. + UnownedPtr m_pXFADocLayout; UnownedPtr m_pFocusNode; UnownedPtr m_pFocusWidget; std::vector m_ValidateNodes; -- cgit v1.2.3