diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-04 08:25:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-04 08:25:34 -0700 |
| commit | f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3 (patch) | |
| tree | edc3d5f35225971679e581c8ef951de8275a944b /core/fpdfapi/parser/cpdf_array.h | |
| parent | 4de3d095c9d9e961f93750cf1ebd489fd515be12 (diff) | |
| download | pdfium-f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3.tar.xz | |
Revert of Remove CPDF_Object::Release() in favor of direct delete (patchset #11 id:200001 of https://codereview.chromium.org/2384883003/ )
Reason for revert:
Looks like it's blocking the roll.
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_compile_dbg_ng/builds/186619
Original issue's description:
> Remove CPDF_Object::Release() in favor of direct delete
>
> Follow-on once we prove Release always deletes in previous CL.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/4de3d095c9d9e961f93750cf1ebd489fd515be12
TBR=thestig@chromium.org,tsepez@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2478253002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_array.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_array.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h index 9deb478809..8cfa0333bb 100644 --- a/core/fpdfapi/parser/cpdf_array.h +++ b/core/fpdfapi/parser/cpdf_array.h @@ -21,7 +21,6 @@ class CPDF_Array : public CPDF_Object { using const_iterator = std::vector<CPDF_Object*>::const_iterator; CPDF_Array(); - ~CPDF_Array() override; // CPDF_Object. Type GetType() const override; @@ -62,12 +61,15 @@ class CPDF_Array : public CPDF_Object { const_iterator end() const { return m_Objects.end(); } protected: + ~CPDF_Array() override; + CPDF_Object* CloneNonCyclic( bool bDirect, std::set<const CPDF_Object*>* pVisited) const override; std::vector<CPDF_Object*> m_Objects; }; +using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>; inline CPDF_Array* ToArray(CPDF_Object* obj) { return obj ? obj->AsArray() : nullptr; @@ -77,12 +79,12 @@ inline const CPDF_Array* ToArray(const CPDF_Object* obj) { return obj ? obj->AsArray() : nullptr; } -inline std::unique_ptr<CPDF_Array> ToArray(std::unique_ptr<CPDF_Object> obj) { +inline UniqueArray ToArray(UniqueObject obj) { CPDF_Array* pArray = ToArray(obj.get()); if (!pArray) return nullptr; obj.release(); - return std::unique_ptr<CPDF_Array>(pArray); + return UniqueArray(pArray); } #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_ |