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

Side by Side Diff: core/fpdfapi/parser/cpdf_array.h

Issue 2384883003: Remove CPDF_Object::Release() in favor of direct delete (Closed)
Patch Set: rebase 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/cfdf_document.cpp ('k') | core/fpdfapi/parser/cpdf_array.cpp » ('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 #ifndef CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_ 7 #ifndef CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_
8 #define CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_ 8 #define CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_
9 9
10 #include <set> 10 #include <set>
11 #include <vector> 11 #include <vector>
12 12
13 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" 13 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
14 #include "core/fpdfapi/parser/cpdf_object.h" 14 #include "core/fpdfapi/parser/cpdf_object.h"
15 #include "core/fxcrt/fx_basic.h" 15 #include "core/fxcrt/fx_basic.h"
16 #include "core/fxcrt/fx_coordinates.h" 16 #include "core/fxcrt/fx_coordinates.h"
17 17
18 class CPDF_Array : public CPDF_Object { 18 class CPDF_Array : public CPDF_Object {
19 public: 19 public:
20 using iterator = std::vector<CPDF_Object*>::iterator; 20 using iterator = std::vector<CPDF_Object*>::iterator;
21 using const_iterator = std::vector<CPDF_Object*>::const_iterator; 21 using const_iterator = std::vector<CPDF_Object*>::const_iterator;
22 22
23 CPDF_Array(); 23 CPDF_Array();
24 ~CPDF_Array() override;
24 25
25 // CPDF_Object. 26 // CPDF_Object.
26 Type GetType() const override; 27 Type GetType() const override;
27 CPDF_Object* Clone() const override; 28 CPDF_Object* Clone() const override;
28 bool IsArray() const override; 29 bool IsArray() const override;
29 CPDF_Array* AsArray() override; 30 CPDF_Array* AsArray() override;
30 const CPDF_Array* AsArray() const override; 31 const CPDF_Array* AsArray() const override;
31 32
32 bool IsEmpty() const { return m_Objects.empty(); } 33 bool IsEmpty() const { return m_Objects.empty(); }
33 size_t GetCount() const { return m_Objects.size(); } 34 size_t GetCount() const { return m_Objects.size(); }
(...skipping 20 matching lines...) Expand all
54 void AddString(const CFX_ByteString& str); 55 void AddString(const CFX_ByteString& str);
55 void AddName(const CFX_ByteString& str); 56 void AddName(const CFX_ByteString& str);
56 void AddReference(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum); 57 void AddReference(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum);
57 58
58 iterator begin() { return m_Objects.begin(); } 59 iterator begin() { return m_Objects.begin(); }
59 iterator end() { return m_Objects.end(); } 60 iterator end() { return m_Objects.end(); }
60 const_iterator begin() const { return m_Objects.begin(); } 61 const_iterator begin() const { return m_Objects.begin(); }
61 const_iterator end() const { return m_Objects.end(); } 62 const_iterator end() const { return m_Objects.end(); }
62 63
63 protected: 64 protected:
64 ~CPDF_Array() override;
65
66 CPDF_Object* CloneNonCyclic( 65 CPDF_Object* CloneNonCyclic(
67 bool bDirect, 66 bool bDirect,
68 std::set<const CPDF_Object*>* pVisited) const override; 67 std::set<const CPDF_Object*>* pVisited) const override;
69 68
70 std::vector<CPDF_Object*> m_Objects; 69 std::vector<CPDF_Object*> m_Objects;
71 }; 70 };
72 using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>;
73 71
74 inline CPDF_Array* ToArray(CPDF_Object* obj) { 72 inline CPDF_Array* ToArray(CPDF_Object* obj) {
75 return obj ? obj->AsArray() : nullptr; 73 return obj ? obj->AsArray() : nullptr;
76 } 74 }
77 75
78 inline const CPDF_Array* ToArray(const CPDF_Object* obj) { 76 inline const CPDF_Array* ToArray(const CPDF_Object* obj) {
79 return obj ? obj->AsArray() : nullptr; 77 return obj ? obj->AsArray() : nullptr;
80 } 78 }
81 79
82 inline UniqueArray ToArray(UniqueObject obj) { 80 inline std::unique_ptr<CPDF_Array> ToArray(std::unique_ptr<CPDF_Object> obj) {
83 CPDF_Array* pArray = ToArray(obj.get()); 81 CPDF_Array* pArray = ToArray(obj.get());
84 if (!pArray) 82 if (!pArray)
85 return nullptr; 83 return nullptr;
86 obj.release(); 84 obj.release();
87 return UniqueArray(pArray); 85 return std::unique_ptr<CPDF_Array>(pArray);
88 } 86 }
89 87
90 #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_ 88 #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cfdf_document.cpp ('k') | core/fpdfapi/parser/cpdf_array.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698