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

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

Issue 2484033002: Return unique_ptr from CPDF_Object::Clone(). (Closed)
Patch Set: std::move() it 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_reference.h ('k') | core/fpdfapi/parser/cpdf_stream.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_reference.h" 7 #include "core/fpdfapi/parser/cpdf_reference.h"
8 8
9 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" 9 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
10 #include "third_party/base/ptr_util.h"
10 #include "third_party/base/stl_util.h" 11 #include "third_party/base/stl_util.h"
11 12
12 CPDF_Reference::CPDF_Reference(CPDF_IndirectObjectHolder* pDoc, int objnum) 13 CPDF_Reference::CPDF_Reference(CPDF_IndirectObjectHolder* pDoc, int objnum)
13 : m_pObjList(pDoc), m_RefObjNum(objnum) {} 14 : m_pObjList(pDoc), m_RefObjNum(objnum) {}
14 15
15 CPDF_Reference::~CPDF_Reference() {} 16 CPDF_Reference::~CPDF_Reference() {}
16 17
17 CPDF_Object::Type CPDF_Reference::GetType() const { 18 CPDF_Object::Type CPDF_Reference::GetType() const {
18 return REFERENCE; 19 return REFERENCE;
19 } 20 }
(...skipping 23 matching lines...) Expand all
43 } 44 }
44 45
45 CPDF_Reference* CPDF_Reference::AsReference() { 46 CPDF_Reference* CPDF_Reference::AsReference() {
46 return this; 47 return this;
47 } 48 }
48 49
49 const CPDF_Reference* CPDF_Reference::AsReference() const { 50 const CPDF_Reference* CPDF_Reference::AsReference() const {
50 return this; 51 return this;
51 } 52 }
52 53
53 CPDF_Object* CPDF_Reference::Clone() const { 54 std::unique_ptr<CPDF_Object> CPDF_Reference::Clone() const {
54 return CloneObjectNonCyclic(false); 55 return CloneObjectNonCyclic(false);
55 } 56 }
56 57
57 CPDF_Object* CPDF_Reference::CloneNonCyclic( 58 std::unique_ptr<CPDF_Object> CPDF_Reference::CloneNonCyclic(
58 bool bDirect, 59 bool bDirect,
59 std::set<const CPDF_Object*>* pVisited) const { 60 std::set<const CPDF_Object*>* pVisited) const {
60 pVisited->insert(this); 61 pVisited->insert(this);
61 if (bDirect) { 62 if (bDirect) {
62 auto* pDirect = GetDirect(); 63 auto* pDirect = GetDirect();
63 return pDirect && !pdfium::ContainsKey(*pVisited, pDirect) 64 return pDirect && !pdfium::ContainsKey(*pVisited, pDirect)
64 ? pDirect->CloneNonCyclic(true, pVisited) 65 ? pDirect->CloneNonCyclic(true, pVisited)
65 : nullptr; 66 : nullptr;
66 } 67 }
67 return new CPDF_Reference(m_pObjList, m_RefObjNum); 68 return pdfium::MakeUnique<CPDF_Reference>(m_pObjList, m_RefObjNum);
68 } 69 }
69 70
70 CPDF_Object* CPDF_Reference::SafeGetDirect() const { 71 CPDF_Object* CPDF_Reference::SafeGetDirect() const {
71 CPDF_Object* obj = GetDirect(); 72 CPDF_Object* obj = GetDirect();
72 return (obj && !obj->IsReference()) ? obj : nullptr; 73 return (obj && !obj->IsReference()) ? obj : nullptr;
73 } 74 }
74 75
75 void CPDF_Reference::SetRef(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum) { 76 void CPDF_Reference::SetRef(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum) {
76 m_pObjList = pDoc; 77 m_pObjList = pDoc;
77 m_RefObjNum = objnum; 78 m_RefObjNum = objnum;
78 } 79 }
79 80
80 CPDF_Object* CPDF_Reference::GetDirect() const { 81 CPDF_Object* CPDF_Reference::GetDirect() const {
81 return m_pObjList ? m_pObjList->GetOrParseIndirectObject(m_RefObjNum) 82 return m_pObjList ? m_pObjList->GetOrParseIndirectObject(m_RefObjNum)
82 : nullptr; 83 : nullptr;
83 } 84 }
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cpdf_reference.h ('k') | core/fpdfapi/parser/cpdf_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698