From 0894dc84013cd6a814136ccd40f585fc2eb895f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 29 Jun 2018 21:54:09 +0000 Subject: Use UnownedPtr to CXFA_Node from outside the tree Comment raw pointers subject to nondeterministic tree destruction order as such to avoid re-attempting to convert to the unowned mechanism. Change-Id: Ia9fe3c8a2729dc1e2b1de4a8c62ae3d2c3d7ec0a Reviewed-on: https://pdfium-review.googlesource.com/36635 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- xfa/fxfa/cxfa_textlayout.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/cxfa_textlayout.h') diff --git a/xfa/fxfa/cxfa_textlayout.h b/xfa/fxfa/cxfa_textlayout.h index 8329e06352..25c73874a8 100644 --- a/xfa/fxfa/cxfa_textlayout.h +++ b/xfa/fxfa/cxfa_textlayout.h @@ -111,9 +111,9 @@ class CXFA_TextLayout { bool Layout(int32_t iBlock); int32_t CountBlocks() const; - CXFA_FFDoc* m_pDoc; - CXFA_TextProvider* m_pTextProvider; - CXFA_Node* m_pTextDataNode; + UnownedPtr m_pDoc; + CXFA_TextProvider* m_pTextProvider; // Raw, TextProvider owned by tree node. + CXFA_Node* m_pTextDataNode; // Raw, this class owned by tree node. bool m_bRichText; std::unique_ptr m_pBreak; std::unique_ptr m_pLoader; -- cgit v1.2.3