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

core/src/fpdfapi/fpdf_font/font_int.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 CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 #define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
+#include <map>
+
+#include "../../../include/fxcrt/fx_basic.h"
+#include "../../../include/fpdfapi/fpdf_resource.h"
+
+class CPDF_CID2UnicodeMap;
+class CPDF_CMap;
+class CPDF_Font;
+class CPDF_Stream;
+
 typedef void* FXFT_Library;
+
 class CPDF_CMapManager {
  public:
   CPDF_CMapManager();
   ~CPDF_CMapManager();
   void* GetPackage(FX_BOOL bPrompt);
   CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt);
   CPDF_CID2UnicodeMap* GetCID2UnicodeMap(int charset, FX_BOOL bPrompt);
   void ReloadAll();
 
  private:
   CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt);
   CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(int charset, FX_BOOL bPrompt);
-  void DropAll(FX_BOOL bReload);
+
   FX_BOOL m_bPrompted;
-  CFX_MapByteStringToPtr m_CMaps;
+  std::map<CFX_ByteString, CPDF_CMap*> m_CMaps;
   CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6];
 };
 class CPDF_FontGlobals {
  public:
   CPDF_FontGlobals();
   ~CPDF_FontGlobals();
   void ClearAll();
   void Clear(void* key);
   CPDF_Font* Find(void* key, int index);
   void Set(void* key, int index, CPDF_Font* pFont);
@@ skipping 129 matching lines @@
   CPDF_CID2UnicodeMap* m_pBaseMap;
   CFX_WideTextBuf m_MultiCharBuf;
 };
 class CPDF_FontCharMap : public CFX_CharMap {
  public:
   CPDF_FontCharMap(CPDF_Font* pFont);
   CPDF_Font* m_pFont;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_