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

Side by Side Diff: core/fpdfapi/page/cpdf_contentmarkitem.h

Issue 2478253002: Revert of Remove CPDF_Object::Release() in favor of direct delete (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 unified diff | Download patch
« no previous file with comments | « core/fpdfapi/page/cpdf_contentmark.cpp ('k') | core/fpdfapi/page/cpdf_contentmarkitem.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_PAGE_CPDF_CONTENTMARKITEM_H_ 7 #ifndef CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_
8 #define CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_ 8 #define CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_
9 9
10 #include <memory> 10 #include <memory>
(...skipping 13 matching lines...) Expand all
24 ~CPDF_ContentMarkItem(); 24 ~CPDF_ContentMarkItem();
25 25
26 CPDF_ContentMarkItem& operator=(CPDF_ContentMarkItem&& other) = default; 26 CPDF_ContentMarkItem& operator=(CPDF_ContentMarkItem&& other) = default;
27 27
28 CFX_ByteString GetName() const { return m_MarkName; } 28 CFX_ByteString GetName() const { return m_MarkName; }
29 ParamType GetParamType() const { return m_ParamType; } 29 ParamType GetParamType() const { return m_ParamType; }
30 CPDF_Dictionary* GetParam() const; 30 CPDF_Dictionary* GetParam() const;
31 bool HasMCID() const; 31 bool HasMCID() const;
32 32
33 void SetName(const CFX_ByteString& name) { m_MarkName = name; } 33 void SetName(const CFX_ByteString& name) { m_MarkName = name; }
34 void SetDirectDict(std::unique_ptr<CPDF_Dictionary> pDict); 34 void SetDirectDict(
35 std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> pDict);
35 void SetPropertiesDict(CPDF_Dictionary* pDict); 36 void SetPropertiesDict(CPDF_Dictionary* pDict);
36 37
37 private: 38 private:
38 CFX_ByteString m_MarkName; 39 CFX_ByteString m_MarkName;
39 ParamType m_ParamType; 40 ParamType m_ParamType;
40 CPDF_Dictionary* m_pPropertiesDict; // not owned. 41 CPDF_Dictionary* m_pPropertiesDict; // not owned.
41 std::unique_ptr<CPDF_Dictionary> m_pDirectDict; 42 std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>
43 m_pDirectDict;
42 }; 44 };
43 45
44 #endif // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_ 46 #endif // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_
OLDNEW
« no previous file with comments | « core/fpdfapi/page/cpdf_contentmark.cpp ('k') | core/fpdfapi/page/cpdf_contentmarkitem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698