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/page/cpdf_contentmarkitem.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/page/cpdf_contentmarkitem.h')
| -rw-r--r-- | core/fpdfapi/page/cpdf_contentmarkitem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/fpdfapi/page/cpdf_contentmarkitem.h b/core/fpdfapi/page/cpdf_contentmarkitem.h index ed2737111b..f1f06c3a38 100644 --- a/core/fpdfapi/page/cpdf_contentmarkitem.h +++ b/core/fpdfapi/page/cpdf_contentmarkitem.h @@ -31,14 +31,16 @@ class CPDF_ContentMarkItem { bool HasMCID() const; void SetName(const CFX_ByteString& name) { m_MarkName = name; } - void SetDirectDict(std::unique_ptr<CPDF_Dictionary> pDict); + void SetDirectDict( + std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> pDict); void SetPropertiesDict(CPDF_Dictionary* pDict); private: CFX_ByteString m_MarkName; ParamType m_ParamType; CPDF_Dictionary* m_pPropertiesDict; // not owned. - std::unique_ptr<CPDF_Dictionary> m_pDirectDict; + std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> + m_pDirectDict; }; #endif // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_ |