From 655c783b8077f18e17418a3aab9b5a07c8055049 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 23 May 2017 17:10:46 -0700 Subject: Convert to CFX_UnownedPtr, part 3. Remove an explicit clear to re-order the member destruction order. Change-Id: I33da3f3de4b8e8e0cfbdceaf5140e98f5d6f904a Reviewed-on: https://pdfium-review.googlesource.com/5791 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fpdfdoc/cpdf_bookmark.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'core/fpdfdoc/cpdf_bookmark.h') diff --git a/core/fpdfdoc/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h index 30a8a512cc..b9a1ac650e 100644 --- a/core/fpdfdoc/cpdf_bookmark.h +++ b/core/fpdfdoc/cpdf_bookmark.h @@ -9,6 +9,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_dest.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" class CPDF_Dictionary; @@ -16,10 +17,12 @@ class CPDF_Document; class CPDF_Bookmark { public: - CPDF_Bookmark() : m_pDict(nullptr) {} - explicit CPDF_Bookmark(CPDF_Dictionary* pDict) : m_pDict(pDict) {} + CPDF_Bookmark(); + CPDF_Bookmark(const CPDF_Bookmark& that); + explicit CPDF_Bookmark(CPDF_Dictionary* pDict); + ~CPDF_Bookmark(); - CPDF_Dictionary* GetDict() const { return m_pDict; } + CPDF_Dictionary* GetDict() const { return m_pDict.Get(); } uint32_t GetColorRef() const; uint32_t GetFontStyle() const; CFX_WideString GetTitle() const; @@ -27,7 +30,7 @@ class CPDF_Bookmark { CPDF_Action GetAction() const; private: - CPDF_Dictionary* m_pDict; + CFX_UnownedPtr m_pDict; }; #endif // CORE_FPDFDOC_CPDF_BOOKMARK_H_ -- cgit v1.2.3