Use pdfium::Contains() in a few more places. No need to call container.count() when the actual count is not needed. Change-Id: I67a396be186b2211ce1b90038342c7d3a0f3ea8f Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/72053 Reviewed-by: Daniel Hosseinian <dhoss@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp b/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp index 8a66c85..cdc818b 100644 --- a/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp +++ b/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
@@ -13,6 +13,7 @@ #include "core/fpdfapi/parser/cpdf_syntax_parser.h" #include "core/fpdfapi/parser/fpdf_parser_utility.h" #include "third_party/base/numerics/safe_conversions.h" +#include "third_party/base/stl_util.h" namespace { @@ -199,7 +200,7 @@ } void CPDF_CrossRefAvail::AddCrossRefForCheck(FX_FILESIZE crossref_offset) { - if (registered_crossrefs_.count(crossref_offset)) + if (pdfium::Contains(registered_crossrefs_, crossref_offset)) return; cross_refs_for_check_.push(crossref_offset);
diff --git a/core/fpdfapi/parser/cpdf_object_avail.cpp b/core/fpdfapi/parser/cpdf_object_avail.cpp index b788bdd..171c521 100644 --- a/core/fpdfapi/parser/cpdf_object_avail.cpp +++ b/core/fpdfapi/parser/cpdf_object_avail.cpp
@@ -11,6 +11,7 @@ #include "core/fpdfapi/parser/cpdf_object_walker.h" #include "core/fpdfapi/parser/cpdf_read_validator.h" #include "core/fpdfapi/parser/cpdf_reference.h" +#include "third_party/base/stl_util.h" CPDF_ObjectAvail::CPDF_ObjectAvail( const RetainPtr<CPDF_ReadValidator>& validator, @@ -147,5 +148,5 @@ } bool CPDF_ObjectAvail::HasObjectParsed(uint32_t obj_num) const { - return parsed_objnums_.count(obj_num) > 0; + return pdfium::Contains(parsed_objnums_, obj_num); }
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index f5990d1..0cbc20a 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -14,6 +14,7 @@ #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" #include "fpdfsdk/pwl/cpwl_list_box.h" +#include "third_party/base/stl_util.h" CFFL_ListBox::CFFL_ListBox(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget) @@ -91,7 +92,7 @@ size_t nSelCount = 0; for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; ++i) { if (pListBox->IsItemSelected(i)) { - if (m_OriginSelections.count(i) == 0) + if (!pdfium::Contains(m_OriginSelections, i)) return true; ++nSelCount;