From 7936fd1091f3101ba99c270e9d83a66b798cee39 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 19 May 2017 16:12:24 -0700 Subject: Use unowned ptr from CXFA_FFDocView to CXFA_FFDoc There's an unique_ptr going in the other direction, so it must outlive this. Change-Id: I28a77fbff67e6682360414e26c807d707602e140 Reviewed-on: https://pdfium-review.googlesource.com/5736 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- xfa/fxfa/cxfa_ffdocview.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/cxfa_ffdocview.h') diff --git a/xfa/fxfa/cxfa_ffdocview.h b/xfa/fxfa/cxfa_ffdocview.h index 83d077b548..3164bcfb6a 100644 --- a/xfa/fxfa/cxfa_ffdocview.h +++ b/xfa/fxfa/cxfa_ffdocview.h @@ -43,7 +43,7 @@ class CXFA_FFDocView { explicit CXFA_FFDocView(CXFA_FFDoc* pDoc); ~CXFA_FFDocView(); - CXFA_FFDoc* GetDoc() { return m_pDoc; } + CXFA_FFDoc* GetDoc() { return m_pDoc.Get(); } int32_t StartLayout(int32_t iStartPage = 0); int32_t DoLayout(); void StopLayout(); @@ -116,7 +116,7 @@ class CXFA_FFDocView { bool ResetSingleWidgetAccData(CXFA_WidgetAcc* pWidgetAcc); CXFA_Node* GetRootSubform(); - CXFA_FFDoc* const m_pDoc; + CFX_UnownedPtr const m_pDoc; std::unique_ptr m_pWidgetHandler; CXFA_LayoutProcessor* m_pXFADocLayout; // Not owned. CFX_UnownedPtr m_pFocusAcc; -- cgit v1.2.3