Merge to XFA: Replace several more CFX_MapPtrToPtr with std::set or std::map

core/src/fxge/ge/text_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_FXGE_GE_TEXT_INT_H_
 #define CORE_SRC_FXGE_GE_TEXT_INT_H_
 
+#include <map>
+
 #include "core/include/fxge/fx_font.h"
 #include "core/include/fxge/fx_freetype.h"
 
 struct _CFX_UniqueKeyGen {
   void Generate(int count, ...);
   FX_CHAR m_Key[128];
   int m_KeyLen;
 };
 class CFX_SizeGlyphCache {
  public:
-  CFX_SizeGlyphCache() { m_GlyphMap.InitHashTable(253); }
+  CFX_SizeGlyphCache() {}
   ~CFX_SizeGlyphCache();
-  CFX_MapPtrToPtr m_GlyphMap;
+  std::map<FX_DWORD, CFX_GlyphBitmap*> m_GlyphMap;
 };
 class CTTFontDesc {
  public:
   CTTFontDesc() {
     m_Type = 0;
     m_pFontData = NULL;
     m_RefCount = 0;
   }
   ~CTTFontDesc();
   // ret < 0, releaseface not appropriate for this object.
@@ skipping 40 matching lines @@
   const CFX_ByteString m_FilePath;
   const CFX_ByteString m_FaceName;
   const CFX_ByteString m_FontTables;
   const FX_DWORD m_FontOffset;
   const FX_DWORD m_FileSize;
   FX_DWORD m_Styles;
   FX_DWORD m_Charsets;
 };
 
 #endif  // CORE_SRC_FXGE_GE_TEXT_INT_H_