From 2a14bde1011a5d374d1109fd83f59a8ff67c162e Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 4 May 2016 06:13:45 -0700 Subject: Replace IFX_MemoryAllocator::Release() with delete. All Release() did was invoke delete. Add some "overrides" while we're at it. Review-Url: https://codereview.chromium.org/1951573002 --- xfa/fde/css/fde_cssstyleselector.cpp | 12 ++++-------- xfa/fde/css/fde_cssstylesheet.cpp | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'xfa/fde/css') diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp index 01a19267e1..27b251a783 100644 --- a/xfa/fde/css/fde_cssstyleselector.cpp +++ b/xfa/fde/css/fde_cssstyleselector.cpp @@ -223,10 +223,8 @@ CFDE_CSSStyleSelector::CFDE_CSSStyleSelector() CFDE_CSSStyleSelector::~CFDE_CSSStyleSelector() { Reset(); - if (m_pInlineStyleStore) - m_pInlineStyleStore->Release(); - if (m_pFixedStyleStore) - m_pFixedStyleStore->Release(); + delete m_pInlineStyleStore; + delete m_pFixedStyleStore; delete m_pAccelerator; } @@ -302,10 +300,8 @@ void CFDE_CSSStyleSelector::Reset() { for (int32_t iGroup = 0; iGroup < FDE_CSSSTYLESHEETGROUP_MAX; ++iGroup) { m_RuleCollection[iGroup].Clear(); } - if (m_pRuleDataStore != NULL) { - m_pRuleDataStore->Release(); - m_pRuleDataStore = NULL; - } + delete m_pRuleDataStore; + m_pRuleDataStore = nullptr; } int32_t CFDE_CSSStyleSelector::MatchDeclarations( CXFA_CSSTagProvider* pTag, diff --git a/xfa/fde/css/fde_cssstylesheet.cpp b/xfa/fde/css/fde_cssstylesheet.cpp index db01274d6a..af6872bbaa 100644 --- a/xfa/fde/css/fde_cssstylesheet.cpp +++ b/xfa/fde/css/fde_cssstylesheet.cpp @@ -101,10 +101,8 @@ void CFDE_CSSStyleSheet::Reset() { m_RuleArray.RemoveAll(); m_Selectors.RemoveAll(); m_StringCache.RemoveAll(); - if (m_pAllocator) { - m_pAllocator->Release(); - m_pAllocator = NULL; - } + delete m_pAllocator; + m_pAllocator = nullptr; } uint32_t CFDE_CSSStyleSheet::AddRef() { return ++m_wRefCount; -- cgit v1.2.3