Add ContainsKey() and ContainsValue() and use them where appropriate.

core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "parser_int.h"
 
 #include <set>
 #include <utility>
@@ skipping 578 matching lines @@
   if (!LoadCrossRefV5(&xrefpos, TRUE)) {
     return FALSE;
   }
   std::set<FX_FILESIZE> seen_xrefpos;
   while (xrefpos) {
     seen_xrefpos.insert(xrefpos);
     if (!LoadCrossRefV5(&xrefpos, FALSE)) {
       return FALSE;
     }
     // Check for circular references.
-    if (seen_xrefpos.find(xrefpos) != seen_xrefpos.end()) {
+    if (pdfium::ContainsKey(seen_xrefpos, xrefpos)) {
       return FALSE;
     }
   }
   m_ObjectStreamMap.InitHashTable(101, FALSE);
   m_bXRefStream = TRUE;
   return TRUE;
 }
 
 FX_BOOL CPDF_Parser::RebuildCrossRef() {
   m_ObjectInfo.clear();
@@ skipping 587 matching lines @@
   if (!pObjStream)
     return nullptr;
 
   ScopedFileStream file(FX_CreateMemoryStream(
       (uint8_t*)pObjStream->GetData(), (size_t)pObjStream->GetSize(), FALSE));
   CPDF_SyntaxParser syntax;
   syntax.InitParser(file.get(), 0);
   const int32_t offset = GetStreamFirst(pObjStream);
 
   // Read object numbers from |pObjStream| into a cache.
-  if (m_ObjCache.find(pObjStream) == m_ObjCache.end()) {
+  if (!pdfium::ContainsKey(m_ObjCache, pObjStream)) {
     for (int32_t i = GetStreamNCount(pObjStream); i > 0; --i) {
       FX_DWORD thisnum = syntax.GetDirectNum();
       FX_DWORD thisoff = syntax.GetDirectNum();
       m_ObjCache[pObjStream][thisnum] = thisoff;
     }
   }
 
   const auto it = m_ObjCache[pObjStream].find(objnum);
   if (it == m_ObjCache[pObjStream].end())
     return nullptr;
@@ skipping 409 matching lines @@
   if (!LoadCrossRefV5(&xrefpos, FALSE)) {
     return FALSE;
   }
   std::set<FX_FILESIZE> seen_xrefpos;
   while (xrefpos) {
     seen_xrefpos.insert(xrefpos);
     if (!LoadCrossRefV5(&xrefpos, FALSE)) {
       return FALSE;
     }
     // Check for circular references.
-    if (seen_xrefpos.find(xrefpos) != seen_xrefpos.end()) {
+    if (pdfium::ContainsKey(seen_xrefpos, xrefpos)) {
       return FALSE;
     }
   }
   m_ObjectStreamMap.InitHashTable(101, FALSE);
   m_bXRefStream = TRUE;
   return TRUE;
 }
 FX_DWORD CPDF_Parser::LoadLinearizedMainXRefTable() {
   FX_DWORD dwSaveMetadataObjnum = m_Syntax.m_MetadataObjnum;
   m_Syntax.m_MetadataObjnum = 0;
@@ skipping 1111 matching lines @@
                         int32_t& iCount,
                         IFX_DownloadHints* pHints,
                         int level);
   FX_BOOL CheckUnkownPageNode(FX_DWORD dwPageNo,
                               CPDF_PageNode* pPageNode,
                               IFX_DownloadHints* pHints);
   FX_BOOL CheckArrayPageNode(FX_DWORD dwPageNo,
                              CPDF_PageNode* pPageNode,
                              IFX_DownloadHints* pHints);
   FX_BOOL CheckPageCount(IFX_DownloadHints* pHints);
-  FX_BOOL IsFirstCheck(int iPage);
+  bool IsFirstCheck(int iPage);
   void ResetFirstCheck(int iPage);
   FX_BOOL IsDataAvail(FX_FILESIZE offset,
                       FX_DWORD size,
                       IFX_DownloadHints* pHints);
 
   CPDF_Parser m_parser;
 
   CPDF_SyntaxParser m_syntaxParser;
 
   CPDF_Object* m_pRoot;
@@ skipping 562 matching lines @@
   if (!pRef) {
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   m_PagesObjNum = pRef->GetRefObjNum();
   m_pCurrentParser = (CPDF_Parser*)m_pDocument->GetParser();
   m_docStatus = PDF_DATAAVAIL_PAGETREE;
   return TRUE;
 }
-FX_BOOL CPDF_DataAvail::IsFirstCheck(int iPage) {
-  if (m_pageMapCheckState.find(iPage) != m_pageMapCheckState.end())
-    return FALSE;
-
-  m_pageMapCheckState.insert(iPage);
-  return TRUE;
+bool CPDF_DataAvail::IsFirstCheck(int iPage) {
+  return m_pageMapCheckState.insert(iPage).second;
 }
 void CPDF_DataAvail::ResetFirstCheck(int iPage) {
   m_pageMapCheckState.erase(iPage);
 }
 FX_BOOL CPDF_DataAvail::CheckPage(IFX_DownloadHints* pHints) {
   FX_DWORD iPageObjs = m_PageObjList.GetSize();
   CFX_DWordArray UnavailObjList;
   for (FX_DWORD i = 0; i < iPageObjs; ++i) {
     FX_DWORD dwPageObjNum = m_PageObjList.GetAt(i);
     FX_BOOL bExist = FALSE;
@@ skipping 1006 matching lines @@
     return DataError;
   }
   if (IsFirstCheck(iPage)) {
     m_bCurPageDictLoadOK = FALSE;
     m_bPageLoadedOK = FALSE;
     m_bAnnotsLoad = FALSE;
     m_bNeedDownLoadResource = FALSE;
     m_objs_array.RemoveAll();
     m_objnum_array.RemoveAll();
   }
-  if (m_pagesLoadState.find(iPage) != m_pagesLoadState.end()) {
+  if (pdfium::ContainsKey(m_pagesLoadState, iPage))
     return DataAvailable;
-  }
+
   if (m_bLinearized) {
     if ((FX_DWORD)iPage == m_dwFirstPageNo) {
       m_pagesLoadState.insert(iPage);
       return DataAvailable;
     }
     int32_t nResult = CheckLinearizedData(pHints);
     if (nResult != DataAvailable) {
       return nResult;
     }
     if (m_pHintTables) {
@@ skipping 593 matching lines @@
   if (!m_pLinearizedDict)
     return -1;
   CPDF_Array* pRange = m_pLinearizedDict->GetArray("H");
   if (!pRange)
     return -1;
   CPDF_Object* pStreamLen = pRange->GetElementValue(1);
   if (!pStreamLen)
     return -1;
   return pStreamLen->GetInteger();
 }