Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: core/fpdfapi/parser/cpdf_indirect_object_holder.cpp

Issue 2478253002: Revert of Remove CPDF_Object::Release() in favor of direct delete (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/fpdfapi/parser/cpdf_indirect_object_holder.h ('k') | core/fpdfapi/parser/cpdf_object.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" 7 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
8 8
9 #include "core/fpdfapi/parser/cpdf_object.h" 9 #include "core/fpdfapi/parser/cpdf_object.h"
10 #include "core/fpdfapi/parser/cpdf_parser.h" 10 #include "core/fpdfapi/parser/cpdf_parser.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) { 63 if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) {
64 delete pObj; 64 delete pObj;
65 return false; 65 return false;
66 } 66 }
67 pObj->m_ObjNum = objnum; 67 pObj->m_ObjNum = objnum;
68 m_IndirectObjs[objnum].reset(pObj); 68 m_IndirectObjs[objnum].reset(pObj);
69 m_LastObjNum = std::max(m_LastObjNum, objnum); 69 m_LastObjNum = std::max(m_LastObjNum, objnum);
70 return true; 70 return true;
71 } 71 }
72 72
73 void CPDF_IndirectObjectHolder::DeleteIndirectObject(uint32_t objnum) { 73 void CPDF_IndirectObjectHolder::ReleaseIndirectObject(uint32_t objnum) {
74 CPDF_Object* pObj = GetIndirectObject(objnum); 74 CPDF_Object* pObj = GetIndirectObject(objnum);
75 if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum) 75 if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum)
76 return; 76 return;
77 77
78 m_IndirectObjs.erase(objnum); 78 m_IndirectObjs.erase(objnum);
79 } 79 }
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cpdf_indirect_object_holder.h ('k') | core/fpdfapi/parser/cpdf_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698