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

Side by Side Diff: core/fpdfapi/page/cpdf_contentmark.cpp

Issue 2477443002: Remove FX_BOOL from core (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.h ('k') | core/fpdfapi/page/cpdf_contentmarkitem.h » ('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 #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 17 matching lines...) Expand all
28 return m_Ref.GetObject()->GetItem(i); 28 return m_Ref.GetObject()->GetItem(i);
29 } 29 }
30 30
31 int CPDF_ContentMark::GetMCID() const { 31 int CPDF_ContentMark::GetMCID() const {
32 const MarkData* pData = m_Ref.GetObject(); 32 const MarkData* pData = m_Ref.GetObject();
33 return pData ? pData->GetMCID() : -1; 33 return pData ? pData->GetMCID() : -1;
34 } 34 }
35 35
36 void CPDF_ContentMark::AddMark(const CFX_ByteString& name, 36 void CPDF_ContentMark::AddMark(const CFX_ByteString& name,
37 CPDF_Dictionary* pDict, 37 CPDF_Dictionary* pDict,
38 FX_BOOL bDirect) { 38 bool bDirect) {
39 m_Ref.GetPrivateCopy()->AddMark(name, pDict, bDirect); 39 m_Ref.GetPrivateCopy()->AddMark(name, pDict, bDirect);
40 } 40 }
41 41
42 void CPDF_ContentMark::DeleteLastMark() { 42 void CPDF_ContentMark::DeleteLastMark() {
43 m_Ref.GetPrivateCopy()->DeleteLastMark(); 43 m_Ref.GetPrivateCopy()->DeleteLastMark();
44 if (CountItems() == 0) 44 if (CountItems() == 0)
45 m_Ref.SetNull(); 45 m_Ref.SetNull();
46 } 46 }
47 47
48 bool CPDF_ContentMark::HasMark(const CFX_ByteStringC& mark) const { 48 bool CPDF_ContentMark::HasMark(const CFX_ByteStringC& mark) const {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 for (const auto& mark : m_Marks) { 97 for (const auto& mark : m_Marks) {
98 CPDF_Dictionary* pDict = mark.GetParam(); 98 CPDF_Dictionary* pDict = mark.GetParam();
99 if (pDict && pDict->KeyExist("MCID")) 99 if (pDict && pDict->KeyExist("MCID"))
100 return pDict->GetIntegerFor("MCID"); 100 return pDict->GetIntegerFor("MCID");
101 } 101 }
102 return -1; 102 return -1;
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 FX_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, ReleaseDeleter<CPDF_Dictionary>>( 113 std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>(
114 ToDictionary(pDict->Clone()))); 114 ToDictionary(pDict->Clone())));
115 } else { 115 } else {
116 item.SetPropertiesDict(pDict); 116 item.SetPropertiesDict(pDict);
117 } 117 }
118 } 118 }
119 m_Marks.push_back(std::move(item)); 119 m_Marks.push_back(std::move(item));
120 } 120 }
121 121
122 void CPDF_ContentMark::MarkData::DeleteLastMark() { 122 void CPDF_ContentMark::MarkData::DeleteLastMark() {
123 if (!m_Marks.empty()) 123 if (!m_Marks.empty())
124 m_Marks.pop_back(); 124 m_Marks.pop_back();
125 } 125 }
OLDNEW
« no previous file with comments | « core/fpdfapi/page/cpdf_contentmark.h ('k') | core/fpdfapi/page/cpdf_contentmarkitem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698