From 4de3d095c9d9e961f93750cf1ebd489fd515be12 Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 3 Nov 2016 17:05:07 -0700 Subject: Remove CPDF_Object::Release() in favor of direct delete Follow-on once we prove Release always deletes in previous CL. Review-Url: https://codereview.chromium.org/2384883003 --- core/fpdfapi/parser/cpdf_array.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_array.cpp') diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp index e118fd66e6..4000bbc980 100644 --- a/core/fpdfapi/parser/cpdf_array.cpp +++ b/core/fpdfapi/parser/cpdf_array.cpp @@ -24,7 +24,7 @@ CPDF_Array::~CPDF_Array() { m_ObjNum = kInvalidObjNum; for (auto& it : m_Objects) { if (it && it->GetObjNum() != kInvalidObjNum) - it->Release(); + delete it; } } @@ -139,10 +139,9 @@ void CPDF_Array::RemoveAt(size_t i, size_t nCount) { if (nCount <= 0 || nCount > m_Objects.size() - i) return; - for (size_t j = 0; j < nCount; ++j) { - if (CPDF_Object* p = m_Objects[i + j]) - p->Release(); - } + for (size_t j = 0; j < nCount; ++j) + delete m_Objects[i + j]; + m_Objects.erase(m_Objects.begin() + i, m_Objects.begin() + i + nCount); } @@ -166,9 +165,7 @@ void CPDF_Array::SetAt(size_t i, CPDF_Object* pObj) { ASSERT(false); return; } - if (CPDF_Object* pOld = m_Objects[i]) - pOld->Release(); - + delete m_Objects[i]; m_Objects[i] = pObj; } -- cgit v1.2.3