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

fpdfsdk/src/javascript/Document.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 "Document.h"
 
 #include "Field.h"
 #include "Icon.h"
@@ skipping 772 matching lines @@
     FXJS_PutObjectString(isolate, pObj, L"Subject", cwSubject.c_str());
     FXJS_PutObjectString(isolate, pObj, L"Keywords", cwKeywords.c_str());
     FXJS_PutObjectString(isolate, pObj, L"Creator", cwCreator.c_str());
     FXJS_PutObjectString(isolate, pObj, L"Producer", cwProducer.c_str());
     FXJS_PutObjectString(isolate, pObj, L"CreationDate",
                          cwCreationDate.c_str());
     FXJS_PutObjectString(isolate, pObj, L"ModDate", cwModDate.c_str());
     FXJS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped.c_str());
 
     // It's to be compatible to non-standard info dictionary.
-    FX_POSITION pos = pDictionary->GetStartPos();
-    while (pos) {
-      CFX_ByteString bsKey;
-      CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey);
+    for (const auto& it : *pDictionary) {
+      const CFX_ByteString& bsKey = it.first;
+      CPDF_Object* pValueObj = it.second;
       CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());
 
       if (pValueObj->IsString() || pValueObj->IsName()) {
         FXJS_PutObjectString(isolate, pObj, wsKey.c_str(),
                              pValueObj->GetUnicodeText().c_str());
       } else if (pValueObj->IsNumber()) {
         FXJS_PutObjectNumber(isolate, pObj, wsKey.c_str(),
                              (float)pValueObj->GetNumber());
       } else if (pValueObj->IsBoolean()) {
         FXJS_PutObjectBoolean(isolate, pObj, wsKey.c_str(),
@@ skipping 836 matching lines @@
     CJS_DelayData* pData = DelayDataForFieldAndControlIndex.GetAt(i);
     Field::DoDelay(m_pDocument, pData);
     DelayDataForFieldAndControlIndex.SetAt(i, NULL);
     delete pData;
   }
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }