Merge to XFA: Replace more CFX_MapPtrToPtr.

core/src/fxge/android/fpf_skiafontmgr.h

Index: core/src/fxge/android/fpf_skiafontmgr.h
diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h
index cd503f58a93974732ea76fe2bdf48e35ae521d78..4625e8c605afd0154b2f6bd53879cdc13b3642cb 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.h
+++ b/core/src/fxge/android/fpf_skiafontmgr.h
@@ -9,6 +9,8 @@
 
 #if _FX_OS_ == _FX_ANDROID_
 
+#include <map>
+
 #include "core/include/fxge/fpf.h"
 
 #define FPF_SKIAFONTTYPE_Unknown 0
@@ -16,6 +18,8 @@
 #define FPF_SKIAFONTTYPE_File 2
 #define FPF_SKIAFONTTYPE_Buffer 3
 
+class CFPF_SkiaFont;
+
 class CFPF_SkiaFontDescriptor {
  public:
   CFPF_SkiaFontDescriptor()
@@ -110,7 +114,7 @@ class CFPF_SkiaFontMgr : public IFPF_FontMgr {
   FX_BOOL m_bLoaded;
   CFX_PtrArray m_FontFaces;
   FXFT_Library m_FTLibrary;
-  CFX_MapPtrToPtr m_FamilyFonts;
+  std::map<FX_DWORD, CFPF_SkiaFont*> m_FamilyFonts;
 };
 
 #endif