diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-23 17:19:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-23 17:19:20 -0700 |
| commit | a2d699f1462050833f959ebcf24853c2a6a10f72 (patch) | |
| tree | 35cc25303ebc2bd68d36255e6db69a08f043dc66 /xfa/fxfa/app/xfa_textlayout.h | |
| parent | db1a24e86d40977fb6d8aa8fa57dadee4c2f1be1 (diff) | |
| download | pdfium-a2d699f1462050833f959ebcf24853c2a6a10f72.tar.xz | |
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
Diffstat (limited to 'xfa/fxfa/app/xfa_textlayout.h')
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index 0b3ec94604..30399a6217 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -171,14 +171,15 @@ class CXFA_LoaderContext { CFX_FloatArray m_BlocksHeight; }; -class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { +class CXFA_LinkUserData : public IFX_Retainable, public CFX_Target { public: CXFA_LinkUserData(IFX_MemoryAllocator* pAllocator, FX_WCHAR* pszText) : m_pAllocator(pAllocator), m_dwRefCount(1), m_wsURLContent(pszText) {} ~CXFA_LinkUserData() override {} - uint32_t AddRef() override { return ++m_dwRefCount; } + // IFX_Retainable: + uint32_t Retain() override { return ++m_dwRefCount; } uint32_t Release() override { uint32_t dwRefCount = --m_dwRefCount; if (dwRefCount <= 0) @@ -194,7 +195,7 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { CFX_WideString m_wsURLContent; }; -class CXFA_TextUserData : public IFX_Unknown, public CFX_Target { +class CXFA_TextUserData : public IFX_Retainable, public CFX_Target { public: CXFA_TextUserData(IFX_MemoryAllocator* pAllocator, IFDE_CSSComputedStyle* pStyle) @@ -204,7 +205,7 @@ class CXFA_TextUserData : public IFX_Unknown, public CFX_Target { m_dwRefCount(0) { ASSERT(m_pAllocator); if (m_pStyle) - m_pStyle->AddRef(); + m_pStyle->Retain(); } CXFA_TextUserData(IFX_MemoryAllocator* pAllocator, IFDE_CSSComputedStyle* pStyle, @@ -215,7 +216,7 @@ class CXFA_TextUserData : public IFX_Unknown, public CFX_Target { m_dwRefCount(0) { ASSERT(m_pAllocator); if (m_pStyle) - m_pStyle->AddRef(); + m_pStyle->Retain(); } ~CXFA_TextUserData() override { if (m_pStyle) @@ -224,7 +225,8 @@ class CXFA_TextUserData : public IFX_Unknown, public CFX_Target { m_pLinkData->Release(); } - uint32_t AddRef() override { return ++m_dwRefCount; } + // IFX_Retainable: + uint32_t Retain() override { return ++m_dwRefCount; } uint32_t Release() override { uint32_t dwRefCount = --m_dwRefCount; if (dwRefCount == 0) |