Merge to XFA: Use std::map as CPDF_Dictionary's underlying store.

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 "core/include/fpdfapi/fpdf_parser.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 851 matching lines @@
                 } else {
                   CPDF_Stream* pStream = pObj->AsStream();
                   if (CPDF_Dictionary* pTrailer =
                           pStream ? pStream->GetDict() : pObj->AsDictionary()) {
                     if (m_pTrailer) {
                       CPDF_Object* pRoot = pTrailer->GetElement("Root");
                       CPDF_Reference* pRef = ToReference(pRoot);
                       if (!pRoot ||
                           (pRef && IsValidObjectNumber(pRef->GetRefObjNum()) &&
                            m_ObjectInfo[pRef->GetRefObjNum()].pos != 0)) {
-                        FX_POSITION trailer_pos = pTrailer->GetStartPos();
-                        while (trailer_pos) {
-                          CFX_ByteString key;
-                          CPDF_Object* pElement =
-                              pTrailer->GetNextElement(trailer_pos, key);
+                        for (const auto& it : *pTrailer) {
+                          const CFX_ByteString& key = it.first;
+                          CPDF_Object* pElement = it.second;
                           FX_DWORD dwObjNum =
                               pElement ? pElement->GetObjNum() : 0;
                           if (dwObjNum) {
                             m_pTrailer->SetAtReference(key, m_pDocument,
                                                        dwObjNum);
                           } else {
                             m_pTrailer->SetAt(key, pElement->Clone());
                           }
                         }
                         pObj->Release();
@@ skipping 1268 matching lines @@
         continue;
 
       if (key == "/Contents")
         dwSignValuePos = m_Pos;
 
       CPDF_Object* pObj = GetObject(pObjList, objnum, gennum, nullptr, true);
       if (!pObj)
         continue;
 
       CFX_ByteStringC keyNoSlash(key.c_str() + 1, key.GetLength() - 1);
-      // TODO(thestig): Remove this conditional once CPDF_Dictionary has a
-      // better underlying map implementation.
-      if (nKeys < 32) {
-        pDict->SetAt(keyNoSlash, pObj);
-      } else {
-        pDict->AddValue(keyNoSlash, pObj);
-      }
+      pDict->SetAt(keyNoSlash, pObj);
     }
 
     if (IsSignatureDict(pDict.get())) {
       FX_FILESIZE dwSavePos = m_Pos;
       m_Pos = dwSignValuePos;
       CPDF_Object* pObj = GetObject(pObjList, objnum, gennum, nullptr, FALSE);
       pDict->SetAt("Contents", pObj);
       m_Pos = dwSavePos;
     }
     if (pContext) {
@@ skipping 126 matching lines @@
       key = PDF_NameDecode(key);
       std::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>> obj(
           GetObject(pObjList, objnum, gennum, nullptr, true));
       if (!obj) {
         uint8_t ch;
         while (GetNextChar(ch) && ch != 0x0A && ch != 0x0D) {
         }
         return nullptr;
       }
       if (key.GetLength() > 1) {
-        pDict->AddValue(CFX_ByteStringC(key.c_str() + 1, key.GetLength() - 1),
-                        obj.release());
+        pDict->SetAt(CFX_ByteStringC(key.c_str() + 1, key.GetLength() - 1),
+                     obj.release());
       }
     }
     if (pContext) {
       pContext->m_DictEnd = m_Pos;
       if (pContext->m_Flags & PDFPARSE_NOSTREAM) {
         return pDict.release();
       }
     }
     FX_FILESIZE SavedPos = m_Pos;
     CFX_ByteString nextword = GetNextWord(nullptr);
@@ skipping 721 matching lines @@
           new_obj_array.Add(pArray->GetElement(k));
         }
       } break;
       case PDFOBJ_STREAM:
         pObj = pObj->GetDict();
       case PDFOBJ_DICTIONARY: {
         CPDF_Dictionary* pDict = pObj->GetDict();
         if (pDict && pDict->GetString("Type") == "Page" && !bParsePage) {
           continue;
         }
-        FX_POSITION pos = pDict->GetStartPos();
-        while (pos) {
-          CPDF_Object* value;
-          CFX_ByteString key;
-          value = pDict->GetNextElement(pos, key);
+        for (const auto& it : *pDict) {
+          const CFX_ByteString& key = it.first;
+          CPDF_Object* value = it.second;
           if (key != "Parent") {
             new_obj_array.Add(value);
           }
         }
       } break;
       case PDFOBJ_REFERENCE: {
         CPDF_Reference* pRef = pObj->AsReference();
         FX_DWORD dwNum = pRef->GetRefObjNum();
         FX_FILESIZE offset;
         FX_DWORD size = GetObjectSize(dwNum, offset);
@@ skipping 1915 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();
 }