From a2d699f1462050833f959ebcf24853c2a6a10f72 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 23 May 2016 17:19:20 -0700 Subject: Rename IFX_Unknown to IFX_Retainable. Rename addRef() method to Retain() to match Release(). This CL does not convert to CFX_RetainPtrs, which will happen in a follow-on. Review-Url: https://codereview.chromium.org/2005933002 --- core/fxcrt/include/fx_basic.h | 8 +++++--- core/fxcrt/include/fx_ucd.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h index d3dce8c749..848429e8f3 100644 --- a/core/fxcrt/include/fx_basic.h +++ b/core/fxcrt/include/fx_basic.h @@ -911,11 +911,13 @@ typedef CFX_ListArrayTemplate, FX_FILESIZE> CFX_FileSizeListArray; #ifdef PDF_ENABLE_XFA -class IFX_Unknown { +class IFX_Retainable { public: - virtual ~IFX_Unknown() {} + virtual uint32_t Retain() = 0; virtual uint32_t Release() = 0; - virtual uint32_t AddRef() = 0; + + protected: + virtual ~IFX_Retainable() {} }; #define FX_IsOdd(a) ((a)&1) #endif // PDF_ENABLE_XFA diff --git a/core/fxcrt/include/fx_ucd.h b/core/fxcrt/include/fx_ucd.h index 0eb159d703..fbf3187c86 100644 --- a/core/fxcrt/include/fx_ucd.h +++ b/core/fxcrt/include/fx_ucd.h @@ -189,7 +189,7 @@ class CFX_RTFChar : public CFX_Char { int16_t m_iBidiOrder; uint32_t m_dwLayoutStyles; uint32_t m_dwIdentity; - IFX_Unknown* m_pUserData; + IFX_Retainable* m_pUserData; }; typedef CFX_ArrayTemplate CFX_RTFCharArray; #endif // PDF_ENABLE_XFA -- cgit v1.2.3