From c25a4219431c90a95233a08f25eecc921abbf3ed Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 14 Oct 2016 17:45:56 -0700 Subject: Revert "Update CPDF_IndirectObjectHolder APIs for unique objects." This reverts commit 3ba098595ae56b64eacc0c25ab76b89a4d78d920. TBR=thestig@chromium.org,weili@chromium.org Review URL: https://codereview.chromium.org/2424533003 . --- core/fpdfapi/parser/cpdf_indirect_object_holder.h | 28 ++++------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_indirect_object_holder.h') diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.h b/core/fpdfapi/parser/cpdf_indirect_object_holder.h index 074e428d43..da4e942b5d 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.h +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.h @@ -10,14 +10,9 @@ #include #include -#include "core/fpdfapi/parser/cpdf_object.h" -#include "core/fxcrt/cfx_string_pool_template.h" -#include "core/fxcrt/cfx_weak_ptr.h" #include "core/fxcrt/fx_system.h" -class CPDF_Array; -class CPDF_Dictionary; -class CPDF_Stream; +class CPDF_Object; class CPDF_IndirectObjectHolder { public: @@ -29,23 +24,12 @@ class CPDF_IndirectObjectHolder { CPDF_Object* GetIndirectObject(uint32_t objnum) const; CPDF_Object* GetOrParseIndirectObject(uint32_t objnum); - void DeleteIndirectObject(uint32_t objnum); - - // Take ownership of |pObj|, returns unowned pointer to it. - CPDF_Object* AddIndirectObject(UniqueObject pObj); - - // Adds and owns a new object, returns unowned pointer to it. - CPDF_Array* AddIndirectArray(); - CPDF_Dictionary* AddIndirectDictionary(); - CPDF_Dictionary* AddIndirectDictionary( - const CFX_WeakPtr& pPool); - CPDF_Stream* AddIndirectStream(); - CPDF_Stream* AddIndirectStream(uint8_t* pData, - uint32_t size, - CPDF_Dictionary* pDict); + void ReleaseIndirectObject(uint32_t objnum); + // Take ownership of |pObj|. + uint32_t AddIndirectObject(CPDF_Object* pObj); bool ReplaceIndirectObjectIfHigherGeneration(uint32_t objnum, - UniqueObject pObj); + CPDF_Object* pObj); uint32_t GetLastObjNum() const { return m_LastObjNum; } void SetLastObjNum(uint32_t objnum) { m_LastObjNum = objnum; } @@ -58,8 +42,6 @@ class CPDF_IndirectObjectHolder { private: uint32_t m_LastObjNum; - - // Ordinary deleter, not Release(). std::map> m_IndirectObjs; }; -- cgit v1.2.3