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

fpdfsdk/src/formfiller/FFL_CBA_Fontmap.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 "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
 
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
@@ skipping 100 matching lines @@
 
   CPDF_Document* pDocument = GetDocument();
   ASSERT(pDocument != NULL);
 
   CPDF_Dictionary* pFonts = pResDict->GetDict("Font");
   if (!pFonts)
     return NULL;
 
   CPDF_Font* pFind = NULL;
 
-  FX_POSITION pos = pFonts->GetStartPos();
-  while (pos) {
-    CPDF_Object* pObj = NULL;
-    CFX_ByteString csKey;
-    pObj = pFonts->GetNextElement(pos, csKey);
+  for (const auto& it : *pFonts) {
+    const CFX_ByteString& csKey = it.first;
+    CPDF_Object* pObj = it.second;
     if (!pObj)
       continue;
 
     CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
     if (!pElement)
       continue;
     if (pElement->GetString("Type") != "Font")
       continue;
 
     CPDF_Font* pFont = pDocument->LoadFont(pElement);
@@ skipping 128 matching lines @@
 
   return pFontDict ? m_pDocument->LoadFont(pFontDict) : nullptr;
 }
 
 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) {
   m_sAPType = sAPType;
 
   Reset();
   Initialize();
 }