From 03de88464cc818ac4353de3e7ec49b98166bcdc5 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 24 Jan 2017 14:24:36 -0800 Subject: Remove last usage of IFX_Retainable. Change-Id: Id2ece818c80e8cce4748b9a237871131a7acd6d1 Reviewed-on: https://pdfium-review.googlesource.com/2354 Commit-Queue: dsinclair Reviewed-by: dsinclair --- xfa/fxfa/app/cxfa_textuserdata.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'xfa/fxfa/app/cxfa_textuserdata.h') diff --git a/xfa/fxfa/app/cxfa_textuserdata.h b/xfa/fxfa/app/cxfa_textuserdata.h index 1eb3b8acb3..b0eff73f2e 100644 --- a/xfa/fxfa/app/cxfa_textuserdata.h +++ b/xfa/fxfa/app/cxfa_textuserdata.h @@ -7,28 +7,26 @@ #ifndef XFA_FXFA_APP_CXFA_TEXTUSERDATA_H_ #define XFA_FXFA_APP_CXFA_TEXTUSERDATA_H_ +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_basic.h" class CFDE_CSSComputedStyle; class CXFA_LinkUserData; -class CXFA_TextUserData : public IFX_Retainable { +class CXFA_TextUserData : public CFX_Retainable { public: - explicit CXFA_TextUserData( - const CFX_RetainPtr& pStyle); - CXFA_TextUserData(const CFX_RetainPtr& pStyle, - CXFA_LinkUserData* pLinkData); - ~CXFA_TextUserData() override; - - // IFX_Retainable: - uint32_t Retain() override; - uint32_t Release() override; + template + friend CFX_RetainPtr pdfium::MakeRetain(Args&&... args); CFX_RetainPtr m_pStyle; - CXFA_LinkUserData* m_pLinkData; + CFX_RetainPtr m_pLinkData; protected: - uint32_t m_dwRefCount; + explicit CXFA_TextUserData( + const CFX_RetainPtr& pStyle); + CXFA_TextUserData(const CFX_RetainPtr& pStyle, + const CFX_RetainPtr& pLinkData); + ~CXFA_TextUserData() override; }; #endif // XFA_FXFA_APP_CXFA_TEXTUSERDATA_H_ -- cgit v1.2.3