diff options
author | Tom Sepez <tsepez@chromium.org> | 2016-10-14 17:45:56 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2016-10-14 17:45:56 -0700 |
commit | c25a4219431c90a95233a08f25eecc921abbf3ed (patch) | |
tree | bd2ad923d527440785c19623fe2d19cc1a70a92d /core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | |
parent | 62f367348ff8ff1e64c6f52c1ee5f77c3a89edc1 (diff) | |
download | pdfium-c25a4219431c90a95233a08f25eecc921abbf3ed.tar.xz |
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 .
Diffstat (limited to 'core/fpdfapi/parser/cpdf_indirect_object_holder.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | 51 |
1 files changed, 12 insertions, 39 deletions
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp index 49567e50a1..6e549de5a7 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp @@ -6,11 +6,8 @@ #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" -#include "core/fpdfapi/parser/cpdf_array.h" -#include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_parser.h" -#include "core/fpdfapi/parser/cpdf_stream.h" CPDF_IndirectObjectHolder::CPDF_IndirectObjectHolder() : m_LastObjNum(0) {} @@ -45,59 +42,35 @@ CPDF_Object* CPDF_IndirectObjectHolder::ParseIndirectObject(uint32_t objnum) { return nullptr; } -CPDF_Object* CPDF_IndirectObjectHolder::AddIndirectObject(UniqueObject pObj) { +uint32_t CPDF_IndirectObjectHolder::AddIndirectObject(CPDF_Object* pObj) { if (pObj->m_ObjNum) - return pObj.release(); // TODO(tsepez): shouldn't happen, stop this leak. + return pObj->m_ObjNum; - pObj->m_ObjNum = ++m_LastObjNum; + m_LastObjNum++; m_IndirectObjs[m_LastObjNum].release(); // TODO(tsepez): stop this leak. - m_IndirectObjs[m_LastObjNum].reset(pObj.release()); // Changes deleters. - return m_IndirectObjs[m_LastObjNum].get(); -} - -CPDF_Array* CPDF_IndirectObjectHolder::AddIndirectArray() { - return ToArray(AddIndirectObject(UniqueObject(new CPDF_Array()))); -} - -CPDF_Dictionary* CPDF_IndirectObjectHolder::AddIndirectDictionary() { - return ToDictionary(AddIndirectObject(UniqueObject(new CPDF_Dictionary()))); -} - -CPDF_Dictionary* CPDF_IndirectObjectHolder::AddIndirectDictionary( - const CFX_WeakPtr<CFX_ByteStringPool>& pPool) { - return ToDictionary( - AddIndirectObject(UniqueObject(new CPDF_Dictionary(pPool)))); -} - -CPDF_Stream* CPDF_IndirectObjectHolder::AddIndirectStream() { - return ToStream(AddIndirectObject(UniqueObject(new CPDF_Stream()))); -} - -CPDF_Stream* CPDF_IndirectObjectHolder::AddIndirectStream( - uint8_t* pData, - uint32_t size, - CPDF_Dictionary* pDict) { - return ToStream( - AddIndirectObject(UniqueObject(new CPDF_Stream(pData, size, pDict)))); + m_IndirectObjs[m_LastObjNum].reset(pObj); + pObj->m_ObjNum = m_LastObjNum; + return m_LastObjNum; } bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration( uint32_t objnum, - UniqueObject pObj) { + CPDF_Object* pObj) { if (!objnum || !pObj) return false; CPDF_Object* pOldObj = GetIndirectObject(objnum); - if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) + if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) { + delete pObj; return false; - + } pObj->m_ObjNum = objnum; - m_IndirectObjs[objnum].reset(pObj.release()); // Changes deleters. + m_IndirectObjs[objnum].reset(pObj); m_LastObjNum = std::max(m_LastObjNum, objnum); return true; } -void CPDF_IndirectObjectHolder::DeleteIndirectObject(uint32_t objnum) { +void CPDF_IndirectObjectHolder::ReleaseIndirectObject(uint32_t objnum) { CPDF_Object* pObj = GetIndirectObject(objnum); if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum) return; |