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

Unified Diff: core/fpdfapi/parser/cpdf_parser.h

Issue 2479303002: Use unique_ptr return from CPDF_Parser::ParseIndirectObject() (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 side-by-side diff with in-line comments
Download patch
Index: core/fpdfapi/parser/cpdf_parser.h
diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h
index 3be157a1a2065d5bf6c67862d1f5ff53ed6adec3..0d687843c809453018f5f9d80efe44a23ee04d9d 100644
--- a/core/fpdfapi/parser/cpdf_parser.h
+++ b/core/fpdfapi/parser/cpdf_parser.h
@@ -58,8 +58,9 @@ class CPDF_Parser {
CPDF_Dictionary* GetEncryptDict() const { return m_pEncryptDict; }
- CPDF_Object* ParseIndirectObject(CPDF_IndirectObjectHolder* pObjList,
- uint32_t objnum);
+ std::unique_ptr<CPDF_Object> ParseIndirectObject(
+ CPDF_IndirectObjectHolder* pObjList,
+ uint32_t objnum);
uint32_t GetLastObjNum() const;
bool IsValidObjectNumber(uint32_t objnum) const;
@@ -78,11 +79,12 @@ class CPDF_Parser {
int GetFileVersion() const { return m_FileVersion; }
bool IsXRefStream() const { return m_bXRefStream; }
- CPDF_Object* ParseIndirectObjectAt(CPDF_IndirectObjectHolder* pObjList,
- FX_FILESIZE pos,
- uint32_t objnum);
+ std::unique_ptr<CPDF_Object> ParseIndirectObjectAt(
+ CPDF_IndirectObjectHolder* pObjList,
+ FX_FILESIZE pos,
+ uint32_t objnum);
- CPDF_Object* ParseIndirectObjectAtByStrict(
+ std::unique_ptr<CPDF_Object> ParseIndirectObjectAtByStrict(
CPDF_IndirectObjectHolder* pObjList,
FX_FILESIZE pos,
uint32_t objnum,
@@ -157,7 +159,7 @@ class CPDF_Parser {
std::set<FX_FILESIZE> m_SortedOffset;
std::vector<CPDF_Dictionary*> m_Trailers;
bool m_bVersionUpdated;
- CPDF_Object* m_pLinearized;
+ std::unique_ptr<CPDF_Object> m_pLinearized;
uint32_t m_dwFirstPageNo;
uint32_t m_dwXrefStartObjNum;

Powered by Google App Engine
This is Rietveld 408576698