From 033e565d8244953afe8eab3d0c7ee1ed9863c921 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 23 May 2017 16:18:28 -0700 Subject: Convert to CFX_UnownedPtr, part 5 Change-Id: Ibdb20fca7e4daae9d61286df4801ac02faf3b281 Reviewed-on: https://pdfium-review.googlesource.com/5831 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- core/fpdfdoc/cpdf_structtree.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'core/fpdfdoc/cpdf_structtree.h') diff --git a/core/fpdfdoc/cpdf_structtree.h b/core/fpdfdoc/cpdf_structtree.h index aa30f802db..037512acfc 100644 --- a/core/fpdfdoc/cpdf_structtree.h +++ b/core/fpdfdoc/cpdf_structtree.h @@ -12,6 +12,7 @@ #include #include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_unowned_ptr.h" class CPDF_Dictionary; class CPDF_Document; @@ -28,9 +29,9 @@ class CPDF_StructTree { int CountTopElements() const; CPDF_StructElement* GetTopElement(int i) const; - const CPDF_Dictionary* GetRoleMap() const { return m_pRoleMap; } - const CPDF_Dictionary* GetPage() const { return m_pPage; } - const CPDF_Dictionary* GetTreeRoot() const { return m_pTreeRoot; } + const CPDF_Dictionary* GetRoleMap() const { return m_pRoleMap.Get(); } + const CPDF_Dictionary* GetPage() const { return m_pPage.Get(); } + const CPDF_Dictionary* GetTreeRoot() const { return m_pTreeRoot.Get(); } private: void LoadPageTree(const CPDF_Dictionary* pPageDict); @@ -41,9 +42,9 @@ class CPDF_StructTree { bool AddTopLevelNode(CPDF_Dictionary* pDict, const CFX_RetainPtr& pElement); - const CPDF_Dictionary* const m_pTreeRoot; - const CPDF_Dictionary* const m_pRoleMap; - const CPDF_Dictionary* m_pPage; + CFX_UnownedPtr const m_pTreeRoot; + CFX_UnownedPtr const m_pRoleMap; + CFX_UnownedPtr m_pPage; std::vector> m_Kids; }; -- cgit v1.2.3