From 3018c1c7323a1aa9fd89c7de5420ed925b5b6611 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 1 Jun 2018 16:41:23 +0000 Subject: Return unique_ptr from CPDFXFA_Context::GetTimerMgr() Proves ownership by avoiding a std::unique_ptr::reset() call. Change-Id: Ia6e11920d84dda49699736ef3189e58d240d409e Reviewed-on: https://pdfium-review.googlesource.com/33230 Commit-Queue: Tom Sepez Reviewed-by: dsinclair --- fpdfsdk/fpdfxfa/cpdfxfa_context.cpp | 9 ++++----- fpdfsdk/fpdfxfa/cpdfxfa_context.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/fpdfxfa') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp index 36d86650b7..446a77ea96 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp @@ -341,9 +341,8 @@ bool CPDFXFA_Context::PutRequestURL(const WideString& wsURL, m_pFormFillEnv->PutRequestURL(wsURL, wsData, wsEncode); } -IFWL_AdapterTimerMgr* CPDFXFA_Context::GetTimerMgr() { - CXFA_FWLAdapterTimerMgr* pAdapter = nullptr; - if (m_pFormFillEnv) - pAdapter = new CXFA_FWLAdapterTimerMgr(m_pFormFillEnv.Get()); - return pAdapter; +std::unique_ptr CPDFXFA_Context::GetTimerMgr() { + if (!m_pFormFillEnv) + return nullptr; + return pdfium::MakeUnique(m_pFormFillEnv.Get()); } diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h index b240e7ee11..6458926a68 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h @@ -91,7 +91,7 @@ class CPDFXFA_Context : public CPDF_Document::Extension, const WideString& wsData, const WideString& wsEncode) override; - IFWL_AdapterTimerMgr* GetTimerMgr() override; + std::unique_ptr GetTimerMgr() override; protected: friend class CPDFXFA_DocEnvironment; -- cgit v1.2.3