Remove IFX_AdditionalFontMgr and IFX_FontMgrDelegate.

xfa/fgas/font/fgas_font.h

Index: xfa/fgas/font/fgas_font.h
diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h
index 56ddb7129f470ff2a24e422b95b9103a5ded4d21..b165a3c786038e099a0177244075a88057fb9958 100644
--- a/xfa/fgas/font/fgas_font.h
+++ b/xfa/fgas/font/fgas_font.h
@@ -101,6 +101,7 @@ class IFX_Font {
   virtual void SetLogicalFontStyle(uint32_t dwLogFontStyle) = 0;
 #endif
 };
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 struct FX_FONTMATCHPARAMS {
   const FX_WCHAR* pwsFamily;
@@ -155,9 +156,7 @@ typedef FX_LPCFONTDESCRIPTOR (*FX_LPMatchFont)(FX_LPFONTMATCHPARAMS pParams,
 FX_LPMatchFont FX_GetDefFontMatchor();
 class IFX_FontMgr {
  public:
-  static IFX_FontMgr* Create(FX_LPEnumAllFonts pEnumerator,
-                             FX_LPMatchFont pMatcher = NULL,
-                             void* pUserData = NULL);
+  static IFX_FontMgr* Create(FX_LPEnumAllFonts pEnumerator);

[dsinclair, 2016/04/07 14:59:50]

As far as I can see these Create() methods are only called with 1 param. Removed
the two extra params.

   virtual ~IFX_FontMgr() {}
   virtual void Release() = 0;
   virtual IFX_Font* GetDefFontByCodePage(
@@ -192,31 +191,9 @@ class IFX_FontMgr {
   virtual void ClearFontCache() = 0;
   virtual void RemoveFont(IFX_Font* pFont) = 0;
 };
-#else
-class IFX_FontMgrDelegate {
- public:
-  virtual ~IFX_FontMgrDelegate() {}
-  virtual IFX_Font* GetDefFontByCodePage(
-      IFX_FontMgr* pFontMgr,
-      uint16_t wCodePage,
-      uint32_t dwFontStyles,
-      const FX_WCHAR* pszFontFamily = NULL) = 0;
-  virtual IFX_Font* GetDefFontByCharset(
-      IFX_FontMgr* pFontMgr,
-      uint8_t nCharset,
-      uint32_t dwFontStyles,
-      const FX_WCHAR* pszFontFamily = NULL) = 0;
-  virtual IFX_Font* GetDefFontByUnicode(
-      IFX_FontMgr* pFontMgr,
-      FX_WCHAR wUnicode,
-      uint32_t dwFontStyles,
-      const FX_WCHAR* pszFontFamily = NULL) = 0;
-  virtual IFX_Font* GetDefFontByLanguage(
-      IFX_FontMgr* pFontMgr,
-      uint16_t wLanguage,
-      uint32_t dwFontStyles,
-      const FX_WCHAR* pszFontFamily = NULL) = 0;
-};
+
+#else   //  _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+
 class IFX_FontSourceEnum {
  public:
   virtual ~IFX_FontSourceEnum() {}
@@ -227,9 +204,7 @@ class IFX_FontSourceEnum {
 IFX_FontSourceEnum* FX_CreateDefaultFontSourceEnum();
 class IFX_FontMgr {
  public:
-  static IFX_FontMgr* Create(IFX_FontSourceEnum* pFontEnum,
-                             IFX_FontMgrDelegate* pDelegate = NULL,
-                             void* pUserData = NULL);
+  static IFX_FontMgr* Create(IFX_FontSourceEnum* pFontEnum);
   virtual ~IFX_FontMgr() {}
   virtual void Release() = 0;
   virtual IFX_Font* GetDefFontByCodePage(
@@ -280,6 +255,6 @@ class IFX_FontMgr {
   virtual void ClearFontCache() = 0;
   virtual void RemoveFont(IFX_Font* pFont) = 0;
 };
-#endif
+#endif  //  _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 #endif  // XFA_FGAS_FONT_FGAS_FONT_H_