From 2d11d72e326140b9abeb6de2db1e28e5bf9d7e64 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 31 May 2018 23:38:32 +0000 Subject: Make CPDF_Document own its Extension. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inverting the ownership from the current situation makes cleanup much more intuitive. Change-Id: Iad9a7ca70c0746170ba753297732e3e34f96c5ba Reviewed-on: https://pdfium-review.googlesource.com/33190 Commit-Queue: Tom Sepez Reviewed-by: dsinclair Reviewed-by: Nicolás Peña Moreno --- core/fpdfapi/parser/cpdf_document.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index c240e77567..c096e89e28 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -56,8 +56,10 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { explicit CPDF_Document(std::unique_ptr pParser); ~CPDF_Document() override; - Extension* GetExtension() const { return m_pExtension.Get(); } - void SetExtension(Extension* pExt) { m_pExtension = pExt; } + Extension* GetExtension() const { return m_pExtension.get(); } + void SetExtension(std::unique_ptr pExt) { + m_pExtension = std::move(pExt); + } CPDF_Parser* GetParser() const { return m_pParser.get(); } const CPDF_Dictionary* GetRoot() const { return m_pRootDict; } @@ -176,7 +178,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { // Dict {objnum, gennum} to page mapping. std::map, CPDF_Page::ObservedPtr> m_PageMap; - UnownedPtr m_pExtension; + std::unique_ptr m_pExtension; }; #endif // CORE_FPDFAPI_PARSER_CPDF_DOCUMENT_H_ -- cgit v1.2.3