core/fpdfapi/parser/cpdf_array.h - Issue 2419173002: Update CPDF_IndirectObjectHolder APIs for unique objects

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

Issue 2419173002: Update CPDF_IndirectObjectHolder APIs for unique objects (Closed)

Patch Set: windows Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« core/fpdfapi/parser/cfdf_document.cpp ('K') | « core/fpdfapi/parser/cfdf_document.cpp ('k') | core/fpdfapi/parser/cpdf_array.cpp » ('j') | core/fpdfapi/parser/cpdf_document.cpp » ('J')

OLD	NEW
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>

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 void InsertAt(size_t index, CPDF_Object* pObj);	47 void InsertAt(size_t index, CPDF_Object* pObj);

48 void RemoveAt(size_t index, size_t nCount = 1);	48 void RemoveAt(size_t index, size_t nCount = 1);

49 void ConvertToIndirectObjectAt(size_t index, CPDF_IndirectObjectHolder* pDoc);	49 void ConvertToIndirectObjectAt(size_t index, CPDF_IndirectObjectHolder* pDoc);

50	50

51 void Add(CPDF_Object* pObj);	51 void Add(CPDF_Object* pObj);

52 void AddNumber(FX_FLOAT f);	52 void AddNumber(FX_FLOAT f);

53 void AddInteger(int i);	53 void AddInteger(int i);

54 void AddString(const CFX_ByteString& str);	54 void AddString(const CFX_ByteString& str);

55 void AddName(const CFX_ByteString& str);	55 void AddName(const CFX_ByteString& str);

56 void AddReference(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum);	56 void AddReference(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum);

	57 void AddReference(CPDF_IndirectObjectHolder* pDoc, const CPDF_Object* objnum);
	Lei Zhang 2016/10/14 23:18:04 Is there any advantage to adding this, versus maki Is there any advantage to adding this, versus making the caller call AddReference(pDoc, pObj->GetObjNum()); ? Convenience? Lei Zhang 2016/10/14 23:18:04 s/objnum/pObj/ ? s/objnum/pObj/ ? Tom Sepez 2016/10/14 23:42:29 Convenience, also probably codesize as we replace Show quoted text On 2016/10/14 23:18:04, Lei Zhang wrote: > Is there any advantage to adding this, versus making the caller call > AddReference(pDoc, pObj->GetObjNum()); ? Convenience? Convenience, also probably codesize as we replace N scattered calls to this with one consolidated one. Tom Sepez 2016/10/14 23:42:29 Done. Show quoted text On 2016/10/14 23:18:04, Lei Zhang wrote: > s/objnum/pObj/ ? Done.
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 ~CPDF_Array() override;

65	66

66 CPDF_Object* CloneNonCyclic(	67 CPDF_Object* CloneNonCyclic(

(...skipping 15 matching lines...) Expand all Loading...
82	83

83 inline UniqueArray ToArray(UniqueObject obj) {	84 inline UniqueArray ToArray(UniqueObject obj) {

84 CPDF_Array* pArray = ToArray(obj.get());	85 CPDF_Array* pArray = ToArray(obj.get());

85 if (!pArray)	86 if (!pArray)

86 return nullptr;	87 return nullptr;

87 obj.release();	88 obj.release();

88 return UniqueArray(pArray);	89 return UniqueArray(pArray);

89 }	90 }

90	91

91 #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_	92 #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_

OLD	NEW