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

core/src/fpdfdoc/doc_utils.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/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
@@ skipping 261 matching lines @@
   }
   CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
   if (!pDR) {
     return 0;
   }
   CPDF_Dictionary* pFonts = pDR->GetDict("Font");
   if (!pFonts) {
     return 0;
   }
   FX_DWORD dwCount = 0;
-  FX_POSITION pos = pFonts->GetStartPos();
-  while (pos) {
-    CPDF_Object* pObj = NULL;
-    CFX_ByteString csKey;
-    pObj = pFonts->GetNextElement(pos, csKey);
+  for (const auto& it : *pFonts) {
+    CPDF_Object* pObj = it.second;
     if (!pObj) {
       continue;
     }
     if (CPDF_Dictionary* pDirect = ToDictionary(pObj->GetDirect())) {
       if (pDirect->GetString("Type") == "Font") {
         dwCount++;
       }
     }
   }
   return dwCount;
 }
 CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
                             CPDF_Document* pDocument,
                             FX_DWORD index,
                             CFX_ByteString& csNameTag) {
   if (!pFormDict) {
     return NULL;
   }
   CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
   if (!pDR) {
     return NULL;
   }
   CPDF_Dictionary* pFonts = pDR->GetDict("Font");
   if (!pFonts) {
     return NULL;
   }
   FX_DWORD dwCount = 0;
-  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;
     if (dwCount == index) {
       csNameTag = csKey;
@@ skipping 35 matching lines @@
     return NULL;
   }
   CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
   if (!pDR) {
     return NULL;
   }
   CPDF_Dictionary* pFonts = pDR->GetDict("Font");
   if (!pFonts) {
     return 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* pFind = pDocument->LoadFont(pElement);
@@ skipping 18 matching lines @@
     return NULL;
   }
   CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
   if (!pDR) {
     return NULL;
   }
   CPDF_Dictionary* pFonts = pDR->GetDict("Font");
   if (!pFonts) {
     return 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* pFind = pDocument->LoadFont(pElement);
     if (!pFind) {
@@ skipping 33 matching lines @@
     return FALSE;
   }
   CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
   if (!pDR) {
     return FALSE;
   }
   CPDF_Dictionary* pFonts = pDR->GetDict("Font");
   if (!pFonts) {
     return FALSE;
   }
-  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;
     }
     if (pFont->GetFontDict() == pElement) {
@@ skipping 15 matching lines @@
   if (!pDR) {
     return FALSE;
   }
   CPDF_Dictionary* pFonts = pDR->GetDict("Font");
   if (!pFonts) {
     return FALSE;
   }
   if (csFontName.GetLength() > 0) {
     csFontName.Remove(' ');
   }
-  FX_POSITION pos = pFonts->GetStartPos();
-  while (pos) {
-    CPDF_Object* pObj = NULL;
-    CFX_ByteString csKey, csTmp;
-    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;
     }
     pFont = pDocument->LoadFont(pElement);
@@ skipping 182 matching lines @@
   CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
   if (pAttr) {
     return pAttr;
   }
   CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
   if (!pParent) {
     return NULL;
   }
   return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }