Revert of Remove CPDF_Object::Release() in favor of direct delete

core/fpdfapi/parser/cpdf_dictionary.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 
 #include <set>
 #include <utility>
@@ skipping 13 matching lines @@
 
 CPDF_Dictionary::CPDF_Dictionary(const CFX_WeakPtr<CFX_ByteStringPool>& pPool)
     : m_pPool(pPool) {}
 
 CPDF_Dictionary::~CPDF_Dictionary() {
   // Mark the object as deleted so that it will not be deleted again
   // in case of cyclic references.
   m_ObjNum = kInvalidObjNum;
   for (const auto& it : m_Map) {
     if (it.second && it.second->GetObjNum() != kInvalidObjNum)
-      delete it.second;
+      it.second->Release();
   }
 }
 
 CPDF_Object::Type CPDF_Dictionary::GetType() const {
   return DICTIONARY;
 }
 
 CPDF_Dictionary* CPDF_Dictionary::GetDict() const {
   // The method should be made non-const if we want to not be const.
   // See bug #234.
@@ skipping 132 matching lines @@
   CHECK(!pObj || pObj->IsInline());
   auto it = m_Map.find(key);
   if (it == m_Map.end()) {
     if (pObj)
       m_Map.insert(std::make_pair(MaybeIntern(key), pObj));
     return;
   }
 
   if (it->second == pObj)
     return;
-  delete it->second;
+  it->second->Release();
 
   if (pObj)
     it->second = pObj;
   else
     m_Map.erase(it);
 }
 
 void CPDF_Dictionary::ConvertToIndirectObjectFor(
     const CFX_ByteString& key,
     CPDF_IndirectObjectHolder* pHolder) {
   auto it = m_Map.find(key);
   if (it == m_Map.end() || it->second->IsReference())
     return;
 
   uint32_t objnum = pHolder->AddIndirectObject(it->second);
   it->second = new CPDF_Reference(pHolder, objnum);
 }
 
 void CPDF_Dictionary::RemoveFor(const CFX_ByteString& key) {
   auto it = m_Map.find(key);
   if (it == m_Map.end())
     return;
 
-  delete it->second;
+  it->second->Release();
   m_Map.erase(it);
 }
 
 void CPDF_Dictionary::ReplaceKey(const CFX_ByteString& oldkey,
                                  const CFX_ByteString& newkey) {
   auto old_it = m_Map.find(oldkey);
   if (old_it == m_Map.end())
     return;
 
   auto new_it = m_Map.find(newkey);
   if (new_it == old_it)
     return;
 
   if (new_it != m_Map.end()) {
-    delete new_it->second;
+    new_it->second->Release();
     new_it->second = old_it->second;
   } else {
     m_Map.insert(std::make_pair(MaybeIntern(newkey), old_it->second));
   }
   m_Map.erase(old_it);
 }
 
 void CPDF_Dictionary::SetIntegerFor(const CFX_ByteString& key, int i) {
   SetFor(key, new CPDF_Number(i));
 }
@@ skipping 40 matching lines @@
   pArray->AddNumber(matrix.c);
   pArray->AddNumber(matrix.d);
   pArray->AddNumber(matrix.e);
   pArray->AddNumber(matrix.f);
   SetFor(key, pArray);
 }
 
 CFX_ByteString CPDF_Dictionary::MaybeIntern(const CFX_ByteString& str) {
   return m_pPool ? m_pPool->Intern(str) : str;
 }