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

core/fpdfapi/page/fpdf_page_parser.cpp

 // Copyright 2014 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/page/pageint.h"
 
 #include <memory>
 #include <utility>
@@ skipping 216 matching lines @@
     m_pCurStates->m_ColorState.Emplace();
   }
   for (size_t i = 0; i < FX_ArraySize(m_Type3Data); ++i) {
     m_Type3Data[i] = 0.0;
   }
 }
 
 CPDF_StreamContentParser::~CPDF_StreamContentParser() {
   ClearAllParams();
   FX_Free(m_pPathPoints);
-  if (m_pLastImageDict) {
-    m_pLastImageDict->Release();
-  }
-  if (m_pLastCloneImageDict) {
-    m_pLastCloneImageDict->Release();
-  }
+  delete m_pLastImageDict;
+  delete m_pLastCloneImageDict;
 }
 
 int CPDF_StreamContentParser::GetNextParamPos() {
   if (m_ParamCount == PARAM_BUF_SIZE) {
     m_ParamStartPos++;
-    if (m_ParamStartPos == PARAM_BUF_SIZE) {
+    if (m_ParamStartPos == PARAM_BUF_SIZE)
       m_ParamStartPos = 0;
-    }
-    if (m_ParamBuf[m_ParamStartPos].m_Type == 0) {
-      if (CPDF_Object* pObject = m_ParamBuf[m_ParamStartPos].m_pObject)
-        pObject->Release();
-    }
+
+    if (m_ParamBuf[m_ParamStartPos].m_Type == 0)
+      delete m_ParamBuf[m_ParamStartPos].m_pObject;
+
     return m_ParamStartPos;
   }
   int index = m_ParamStartPos + m_ParamCount;
   if (index >= PARAM_BUF_SIZE) {
     index -= PARAM_BUF_SIZE;
   }
   m_ParamCount++;
   return index;
 }
 
@@ skipping 26 matching lines @@
 
 void CPDF_StreamContentParser::AddObjectParam(CPDF_Object* pObj) {
   ContentParam& param = m_ParamBuf[GetNextParamPos()];
   param.m_Type = ContentParam::OBJECT;
   param.m_pObject = pObj;
 }
 
 void CPDF_StreamContentParser::ClearAllParams() {
   uint32_t index = m_ParamStartPos;
   for (uint32_t i = 0; i < m_ParamCount; i++) {
-    if (m_ParamBuf[index].m_Type == 0) {
-      if (CPDF_Object* pObject = m_ParamBuf[index].m_pObject)
-        pObject->Release();
-    }
+    if (m_ParamBuf[index].m_Type == 0)
+      delete m_ParamBuf[index].m_pObject;
+
     index++;
-    if (index == PARAM_BUF_SIZE) {
+    if (index == PARAM_BUF_SIZE)
       index = 0;
-    }
   }
   m_ParamStartPos = 0;
   m_ParamCount = 0;
 }
 
 CPDF_Object* CPDF_StreamContentParser::GetObject(uint32_t index) {
   if (index >= m_ParamCount) {
     return nullptr;
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
@@ skipping 259 matching lines @@
   FX_FILESIZE savePos = m_pSyntax->GetPos();
   CPDF_Dictionary* pDict =
       new CPDF_Dictionary(m_pDocument->GetByteStringPool());
   while (1) {
     CPDF_StreamParser::SyntaxType type = m_pSyntax->ParseNextElement();
     if (type == CPDF_StreamParser::Keyword) {
       CFX_ByteString bsKeyword(m_pSyntax->GetWordBuf(),
                                m_pSyntax->GetWordSize());
       if (bsKeyword != "ID") {
         m_pSyntax->SetPos(savePos);
-        pDict->Release();
+        delete pDict;
         return;
       }
     }
     if (type != CPDF_StreamParser::Name) {
       break;
     }
     CFX_ByteString key((const FX_CHAR*)m_pSyntax->GetWordBuf() + 1,
                        m_pSyntax->GetWordSize() - 1);
-    std::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>> pObj(
-        m_pSyntax->ReadNextObject(false, 0));
+    std::unique_ptr<CPDF_Object> pObj(m_pSyntax->ReadNextObject(false, 0));
     if (!key.IsEmpty()) {
       uint32_t dwObjNum = pObj ? pObj->GetObjNum() : 0;
       if (dwObjNum)
         pDict->SetReferenceFor(key, m_pDocument, dwObjNum);
       else
         pDict->SetFor(key, pObj.release());
     }
   }
   PDF_ReplaceAbbr(pDict);
   CPDF_Object* pCSObj = nullptr;
@@ skipping 22 matching lines @@
     }
     if (m_pSyntax->GetWordSize() == 2 && m_pSyntax->GetWordBuf()[0] == 'E' &&
         m_pSyntax->GetWordBuf()[1] == 'I') {
       break;
     }
   }
   pDict->SetNameFor("Subtype", "Image");
   CPDF_ImageObject* pImgObj = AddImage(pStream, nullptr, true);
   if (!pImgObj) {
     if (pStream) {
-      pStream->Release();
+      delete pStream;
     } else {
-      pDict->Release();
+      delete pDict;
     }
   }
 }
 
 void CPDF_StreamContentParser::Handle_BeginMarkedContent() {
   m_CurContentMark.AddMark(GetString(0), nullptr, FALSE);
 }
 
 void CPDF_StreamContentParser::Handle_BeginText() {
   m_pCurStates->m_TextMatrix.Set(1.0f, 0, 0, 1.0f, 0, 0);
@@ skipping 1005 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }