diff options
| author | tsepez <tsepez@chromium.org> | 2016-11-04 11:38:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-04 11:38:40 -0700 |
| commit | 33fdebc3da676bff84d0fd0f69b9087c0c12dfeb (patch) | |
| tree | 274499f6bc4df60ebb57a52bf78b82180ea52295 /core/fpdfapi/parser/cpdf_object.h | |
| parent | 761eed284e1248f851fbb23beaa45835b644ecee (diff) | |
| download | pdfium-33fdebc3da676bff84d0fd0f69b9087c0c12dfeb.tar.xz | |
Reland "Remove CPDF_Object::Release() in favor of direct delete"
This reverts commit f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3.
Review-Url: https://codereview.chromium.org/2478303002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_object.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_object.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/fpdfapi/parser/cpdf_object.h b/core/fpdfapi/parser/cpdf_object.h index c888605d72..8f6491ec72 100644 --- a/core/fpdfapi/parser/cpdf_object.h +++ b/core/fpdfapi/parser/cpdf_object.h @@ -38,6 +38,8 @@ class CPDF_Object { REFERENCE }; + virtual ~CPDF_Object(); + virtual Type GetType() const = 0; uint32_t GetObjNum() const { return m_ObjNum; } uint32_t GetGenNum() const { return m_GenNum; } @@ -50,8 +52,6 @@ class CPDF_Object { 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; @@ -94,10 +94,8 @@ class CPDF_Object { 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; @@ -118,6 +116,4 @@ class CPDF_Object { CPDF_Object(const CPDF_Object& src) {} }; -using UniqueObject = std::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>>; - #endif // CORE_FPDFAPI_PARSER_CPDF_OBJECT_H_ |