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

core/fpdfapi/parser/cpdf_object.h

 // 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
 
 #ifndef CORE_FPDFAPI_PARSER_CPDF_OBJECT_H_
 #define CORE_FPDFAPI_PARSER_CPDF_OBJECT_H_
 
 #include <memory>
@@ skipping 20 matching lines @@
     NUMBER,
     STRING,
     NAME,
     ARRAY,
     DICTIONARY,
     STREAM,
     NULLOBJ,
     REFERENCE
   };
 
-  virtual ~CPDF_Object();
-
   virtual Type GetType() const = 0;
   uint32_t GetObjNum() const { return m_ObjNum; }
   uint32_t GetGenNum() const { return m_GenNum; }
   bool IsInline() const { return m_ObjNum == 0; }
 
   // Create a deep copy of the object.
   virtual CPDF_Object* Clone() const = 0;
   // Create a deep copy of the object except any reference object be
   // copied to the object it points to directly.
   virtual CPDF_Object* CloneDirectObject() const;
   virtual CPDF_Object* GetDirect() const;
 
+  void Release();
+
   virtual CFX_ByteString GetString() const;
   virtual CFX_WideString GetUnicodeText() const;
   virtual FX_FLOAT GetNumber() const;
   virtual int GetInteger() const;
   virtual CPDF_Dictionary* GetDict() const;
 
   virtual void SetString(const CFX_ByteString& str);
 
   virtual bool IsArray() const;
   virtual bool IsBoolean() const;
@@ skipping 22 matching lines @@
   virtual const CPDF_String* AsString() const;
 
  protected:
   friend class CPDF_Array;
   friend class CPDF_Dictionary;
   friend class CPDF_Document;
   friend class CPDF_IndirectObjectHolder;
   friend class CPDF_Parser;
   friend class CPDF_Reference;
   friend class CPDF_Stream;
+  friend struct std::default_delete<CPDF_Object>;
 
   CPDF_Object() : m_ObjNum(0), m_GenNum(0) {}
+  virtual ~CPDF_Object();
 
   CPDF_Object* CloneObjectNonCyclic(bool bDirect) const;
 
   // Create a deep copy of the object with the option to either
   // copy a reference object or directly copy the object it refers to
   // when |bDirect| is true.
   // Also check cyclic reference against |pVisited|, no copy if it is found.
   // Complex objects should implement their own CloneNonCyclic()
   // function to properly check for possible loop.
   virtual CPDF_Object* CloneNonCyclic(
       bool bDirect,
       std::set<const CPDF_Object*>* pVisited) const;
 
   uint32_t m_ObjNum;
   uint32_t m_GenNum;
 
  private:
   CPDF_Object(const CPDF_Object& src) {}
 };
 
+using UniqueObject = std::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>>;
+
 #endif  // CORE_FPDFAPI_PARSER_CPDF_OBJECT_H_