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

core/include/fxge/fx_font.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_INCLUDE_FXGE_FX_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
@@ skipping 487 matching lines @@
                                      CFX_ByteStringC& FaceGlyphsKey,
                                      FX_DWORD glyph_index,
                                      FX_BOOL bFontStyle,
                                      int dest_width,
                                      int anti_alias);
   void InitPlatform();
   void DestroyPlatform();
 
   FXFT_Face const m_Face;
   std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap;
-  CFX_MapPtrToPtr m_PathMap;
+  std::map<FX_DWORD, CFX_PathData*> m_PathMap;
   CFX_DIBitmap* m_pBitmap;
 };
 
 struct FXTEXT_GLYPHPOS {
   const CFX_GlyphBitmap* m_pGlyph;
   int m_OriginX;
   int m_OriginY;
   FX_FLOAT m_fOriginX;
   FX_FLOAT m_fOriginY;
 };
@@ skipping 11 matching lines @@
 
  protected:
   virtual ~IFX_GSUBTable() {}
 };
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table, FX_DWORD name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_