Merge to XFA: Kill IFX_FontMapper

(cherry picked from commit 01fa1efb228acdcf5250804c670107133668e4b2)
Orignal Review URL: https://codereview.chromium.org/1259123005 .

conflicts:
  core/include/fxge/fx_font.h
  core/src/fxge/ge/fx_ge_fontmap.cpp

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1262723006 .

2 files changed, 12 insertions, 21 deletions

diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 0f7c18eb04..c1e135730b 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -18,7 +18,6 @@ class IFX_FontEncoding;
 class CFX_PathData;
 class CFX_SubstFont;
 class CFX_FaceCache;
-class IFX_FontMapper;
 class CFX_FontMapper;
 class IFX_SystemFontInfo;
 class CFontFileFaceInfo;
@@ -255,22 +254,10 @@ public:
 
     FX_BOOL			GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index);
     CFX_FontMapper*	m_pBuiltinMapper;
-    IFX_FontMapper*	m_pExtMapper;
     CFX_MapByteStringToPtr	m_FaceMap;
     FXFT_Library	m_FTLibrary;
     FoxitFonts m_ExternalFonts[16];
 };
-class IFX_FontMapper
-{
-public:
-
-    virtual ~IFX_FontMapper() {}
-
-    virtual FXFT_Face	FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
-                                      int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont) = 0;
-
-    CFX_FontMgr*		m_pFontMgr;
-};
 class IFX_FontEnumerator
 {
 public:
@@ -287,13 +274,15 @@ public:
     virtual int  CountFiles() = 0;
     virtual IFX_FileStream* GetFontFile(int index) = 0;
 };
-class CFX_FontMapper : public IFX_FontMapper
+class CFX_FontMapper
 {
 public:
-    CFX_FontMapper();
-    virtual ~CFX_FontMapper();
-    void                        SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
-    IFX_SystemFontInfo*         GetSystemFontInfo()
+
+    CFX_FontMapper(CFX_FontMgr* mgr);
+    ~CFX_FontMapper();
+
+    void				SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
+    IFX_SystemFontInfo*	GetSystemFontInfo()
     {
         return m_pFontInfo;
     }
@@ -308,14 +297,16 @@ public:
     {
         return m_pFontEnumerator;
     }
-    virtual FXFT_Face           FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
-                                              int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont);
+
+    FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
+                            int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont);
     FXFT_Face                   FindSubstFontByUnicode(FX_DWORD dwUnicode, FX_DWORD flags, int weight, int italic_angle);

     FX_BOOL                     IsBuiltinFace(const FXFT_Face face) const;
 
 private:
     static const size_t         MM_FACE_COUNT = 2;
     static const size_t         FOXIT_FACE_COUNT = 14;
+
     CFX_ByteString              GetPSNameFromTT(void* hFont);
     CFX_ByteString              MatchInstalledFonts(const CFX_ByteString& norm_name);
     FXFT_Face                   UseInternalSubst(CFX_SubstFont* pSubstFont, int iBaseFont, int italic_angle, int weight, int picthfamily);
@@ -328,6 +319,7 @@ private:
     IFX_SystemFontInfo*         m_pFontInfo;
     FXFT_Face                   m_FoxitFaces[FOXIT_FACE_COUNT];
     IFX_FontEnumerator*         m_pFontEnumerator;
+    CFX_FontMgr* const m_pFontMgr;
 };
 class IFX_SystemFontInfo
 {
diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h
index fd9c148b62..dd349adb29 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/include/fxge/fx_ge.h
@@ -42,7 +42,6 @@ public:
     }
     void					SetTextGamma(FX_FLOAT gammaValue);
     const uint8_t*				GetTextGammaTable();
-    void					SetExtFontMapper(IFX_FontMapper* pFontMapper);
 
     void					SetCodecModule(CCodec_ModuleMgr* pCodecModule)
     {