diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-29 21:54:09 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-29 21:54:09 +0000 |
| commit | 0894dc84013cd6a814136ccd40f585fc2eb895f3 (patch) | |
| tree | 94c24550d43acc7f5f83e135a0a29ded680e7177 /xfa/fxfa/cxfa_textlayout.h | |
| parent | 81fcde731fe44ef5a11748536a2d6404906c80ff (diff) | |
| download | pdfium-0894dc84013cd6a814136ccd40f585fc2eb895f3.tar.xz | |
Use UnownedPtr to CXFA_Node from outside the treechromium/3477
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 <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textlayout.h')
| -rw-r--r-- | xfa/fxfa/cxfa_textlayout.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<CXFA_FFDoc> 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<CFX_RTFBreak> m_pBreak; std::unique_ptr<CXFA_LoaderContext> m_pLoader; |