| OLD | NEW |
| 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 #include "core/fpdfapi/page/cpdf_contentmark.h" | 7 #include "core/fpdfapi/page/cpdf_contentmark.h" |
| 8 | 8 |
| 9 #include "core/fpdfapi/parser/cpdf_dictionary.h" | 9 #include "core/fpdfapi/parser/cpdf_dictionary.h" |
| 10 #include "third_party/base/stl_util.h" | 10 #include "third_party/base/stl_util.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } | 103 } |
| 104 | 104 |
| 105 void CPDF_ContentMark::MarkData::AddMark(const CFX_ByteString& name, | 105 void CPDF_ContentMark::MarkData::AddMark(const CFX_ByteString& name, |
| 106 CPDF_Dictionary* pDict, | 106 CPDF_Dictionary* pDict, |
| 107 bool bDirect) { | 107 bool bDirect) { |
| 108 CPDF_ContentMarkItem item; | 108 CPDF_ContentMarkItem item; |
| 109 item.SetName(name); | 109 item.SetName(name); |
| 110 if (pDict) { | 110 if (pDict) { |
| 111 if (bDirect) { | 111 if (bDirect) { |
| 112 item.SetDirectDict( | 112 item.SetDirectDict( |
| 113 std::unique_ptr<CPDF_Dictionary>(ToDictionary(pDict->Clone()))); | 113 std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>( |
| 114 ToDictionary(pDict->Clone()))); |
| 114 } else { | 115 } else { |
| 115 item.SetPropertiesDict(pDict); | 116 item.SetPropertiesDict(pDict); |
| 116 } | 117 } |
| 117 } | 118 } |
| 118 m_Marks.push_back(std::move(item)); | 119 m_Marks.push_back(std::move(item)); |
| 119 } | 120 } |
| 120 | 121 |
| 121 void CPDF_ContentMark::MarkData::DeleteLastMark() { | 122 void CPDF_ContentMark::MarkData::DeleteLastMark() { |
| 122 if (!m_Marks.empty()) | 123 if (!m_Marks.empty()) |
| 123 m_Marks.pop_back(); | 124 m_Marks.pop_back(); |
| 124 } | 125 } |
| OLD | NEW |