Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).

fpdfsdk/include/javascript/global.h

 // 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
 
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 
+#include <map>
+
 #include "JS_Define.h"
 
 class CJS_GlobalData;
 class CJS_GlobalVariableArray;
 class CJS_KeyValue;
 
 struct JSGlobalData {
   JSGlobalData() {
     nType = 0;
     dData = 0;
@@ skipping 42 matching lines @@
                              bool bData,
                              const CFX_ByteString& sData,
                              JSObject pData,
                              bool bDefaultPersistent);
 
   void ObjectToArray(v8::Local<v8::Object> pObj,
                      CJS_GlobalVariableArray& array);
   void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData);
 
  private:
-  CFX_MapByteStringToPtr m_mapGlobal;
+  std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal;
   CFX_WideString m_sFilePath;
   CJS_GlobalData* m_pGlobalData;
   CPDFDoc_Environment* m_pApp;
 };
 
 class CJS_Global : public CJS_Object {
  public:
   explicit CJS_Global(JSFXObject pObject) : CJS_Object(pObject) {}
   ~CJS_Global() override {}
 
   // CJS_Object
   FX_BOOL InitInstance(IFXJS_Context* cc) override;
 
   DECLARE_SPECIAL_JS_CLASS(CJS_Global);
 
   JS_SPECIAL_STATIC_METHOD(setPersistent, JSGlobalAlternate, global);
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_