diff options
author | tsepez <tsepez@chromium.org> | 2016-11-07 13:49:17 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-07 13:49:17 -0800 |
commit | 5ab31ef3ed4c86211f1ebb3686abb4f5a66472ec (patch) | |
tree | 87c1fda94151528b7fcfa3a18cfda87a78cd3b4f /core/fpdfapi/parser/cpdf_data_avail.h | |
parent | c09625ca59701fabeb49dc59edcf33031b2c6672 (diff) | |
download | pdfium-5ab31ef3ed4c86211f1ebb3686abb4f5a66472ec.tar.xz |
Use unique_ptr return from CPDF_Parser::ParseIndirectObject()
In turn, propgate to callers. This introduces a few
release() calls that will go away as more code is converted.
It also removes a couple of WrapUnique calls that are no
longer needed as ownership of the object flows along.
Review-Url: https://codereview.chromium.org/2479303002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_data_avail.h')
-rw-r--r-- | core/fpdfapi/parser/cpdf_data_avail.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfapi/parser/cpdf_data_avail.h b/core/fpdfapi/parser/cpdf_data_avail.h index e4fc7bad8b..250064f38a 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.h +++ b/core/fpdfapi/parser/cpdf_data_avail.h @@ -156,13 +156,13 @@ class CPDF_DataAvail final { void SetStartOffset(FX_FILESIZE dwOffset); bool GetNextToken(CFX_ByteString& token); bool GetNextChar(uint8_t& ch); - CPDF_Object* ParseIndirectObjectAt( + std::unique_ptr<CPDF_Object> ParseIndirectObjectAt( FX_FILESIZE pos, uint32_t objnum, CPDF_IndirectObjectHolder* pObjList = nullptr); - CPDF_Object* GetObject(uint32_t objnum, - DownloadHints* pHints, - bool* pExistInFile); + std::unique_ptr<CPDF_Object> GetObject(uint32_t objnum, + DownloadHints* pHints, + bool* pExistInFile); bool GetPageKids(CPDF_Parser* pParser, CPDF_Object* pPages); bool PreparePageItem(); bool LoadPages(DownloadHints* pHints); @@ -197,7 +197,7 @@ class CPDF_DataAvail final { IFX_SeekableReadStream* const m_pFileRead; CPDF_Parser m_parser; CPDF_SyntaxParser m_syntaxParser; - CPDF_Object* m_pRoot; + std::unique_ptr<CPDF_Object> m_pRoot; uint32_t m_dwRootObjNum; uint32_t m_dwInfoObjNum; std::unique_ptr<CPDF_LinearizedHeader> m_pLinearized; @@ -239,7 +239,7 @@ class CPDF_DataAvail final { bool m_bNeedDownLoadResource; bool m_bPageLoadedOK; bool m_bLinearizedFormParamLoad; - std::vector<CPDF_Object*> m_PagesArray; + std::vector<std::unique_ptr<CPDF_Object>> m_PagesArray; uint32_t m_dwEncryptObjNum; FX_FILESIZE m_dwPrevXRefOffset; bool m_bTotalLoadPageTree; |