Remove IFX_AdditionalFontMgr and IFX_FontMgrDelegate.

xfa/fgas/font/fgas_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 XFA_FGAS_FONT_FGAS_FONT_H_
 #define XFA_FGAS_FONT_FGAS_FONT_H_
 
 #include "core/fxge/include/fx_font.h"
@@ skipping 83 matching lines @@
   virtual FX_BOOL GetBBox(CFX_Rect& bbox) = 0;
   virtual int32_t GetItalicAngle() const = 0;
   virtual void Reset() = 0;
   virtual IFX_Font* GetSubstFont(int32_t iGlyphIndex) const = 0;
   virtual void* GetDevFont() const = 0;
   virtual void SetFontProvider(IFX_FontProvider* pProvider) = 0;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   virtual void SetLogicalFontStyle(uint32_t dwLogFontStyle) = 0;
 #endif
 };
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 struct FX_FONTMATCHPARAMS {
   const FX_WCHAR* pwsFamily;
   uint32_t dwFontStyles;
   uint32_t dwUSB;
   uint32_t dwMatchFlags;
   FX_WCHAR wUnicode;
   uint16_t wCodePage;
 };
 typedef FX_FONTMATCHPARAMS* FX_LPFONTMATCHPARAMS;
 typedef FX_FONTMATCHPARAMS const* FX_LPCFONTMATCHPARAMS;
 
 struct FX_FONTSIGNATURE {
   uint32_t fsUsb[4];
   uint32_t fsCsb[2];
 };
 inline bool operator==(const FX_FONTSIGNATURE& left,
                        const FX_FONTSIGNATURE& right) {
   return left.fsUsb[0] == right.fsUsb[0] && left.fsUsb[1] == right.fsUsb[1] &&
          left.fsUsb[2] == right.fsUsb[2] && left.fsUsb[3] == right.fsUsb[3] &&
          left.fsCsb[0] == right.fsCsb[0] && left.fsCsb[1] == right.fsCsb[1];
 }
 
 struct FX_FONTDESCRIPTOR {
   FX_WCHAR wsFontFace[32];
   uint32_t dwFontStyles;
   uint8_t uCharSet;
   FX_FONTSIGNATURE FontSignature;
 };
 typedef FX_FONTDESCRIPTOR* FX_LPFONTDESCRIPTOR;

[Tom Sepez, 2016/04/08 15:34:07]

nit: can we kill these two typedefs while we're at it, replacing their usage
with FX_FONTDESCRIPTOR* etc as needed?

[dsinclair, 2016/04/11 13:19:38]

Done.

 typedef FX_FONTDESCRIPTOR const* FX_LPCFONTDESCRIPTOR;
 typedef CFX_MassArrayTemplate<FX_FONTDESCRIPTOR> CFX_FontDescriptors;
 inline bool operator==(const FX_FONTDESCRIPTOR& left,
                        const FX_FONTDESCRIPTOR& right) {
   return left.uCharSet == right.uCharSet &&
          left.dwFontStyles == right.dwFontStyles &&
          left.FontSignature == right.FontSignature &&
          FXSYS_wcscmp(left.wsFontFace, right.wsFontFace) == 0;
 }
 
 #define FX_FONTMATCHPARA_MacthStyle 0x01
 #define FX_FONTMATCHPARA_MacthFamily 0x02
 #define FX_FONTMATCHPARA_MacthUnicode 0x04
 typedef void (*FX_LPEnumAllFonts)(CFX_FontDescriptors& fonts,
-                                  void* pUserData,
                                   const FX_WCHAR* pwsFaceName,
                                   FX_WCHAR wUnicode);
 FX_LPEnumAllFonts FX_GetDefFontEnumerator();
-typedef FX_LPCFONTDESCRIPTOR (*FX_LPMatchFont)(FX_LPFONTMATCHPARAMS pParams,
-                                               const CFX_FontDescriptors& fonts,
-                                               void* pUserData);
+typedef FX_LPCFONTDESCRIPTOR (*FX_LPMatchFont)(
+    FX_LPFONTMATCHPARAMS pParams,
+    const CFX_FontDescriptors& fonts);
 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);
   virtual ~IFX_FontMgr() {}
   virtual void Release() = 0;
   virtual IFX_Font* GetDefFontByCodePage(
       uint16_t wCodePage,
       uint32_t dwFontStyles,
       const FX_WCHAR* pszFontFamily = NULL) = 0;
   virtual IFX_Font* GetDefFontByCharset(
       uint8_t nCharset,
       uint32_t dwFontStyles,
       const FX_WCHAR* pszFontFamily = NULL) = 0;
@@ skipping 14 matching lines @@
                              const FX_WCHAR* pszFontAlias = NULL,
                              uint32_t dwFontStyles = 0,
                              uint16_t wCodePage = 0,
                              FX_BOOL bSaveStream = FALSE) = 0;
   virtual IFX_Font* LoadFont(IFX_Font* pSrcFont,
                              uint32_t dwFontStyles,
                              uint16_t wCodePage = 0xFFFF) = 0;
   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() {}
   virtual void Release() = 0;
-  virtual FX_POSITION GetStartPosition(void* pUserData = NULL) = 0;
-  virtual IFX_FileAccess* GetNext(FX_POSITION& pos, void* pUserData = NULL) = 0;
+  virtual FX_POSITION GetStartPosition() = 0;
+  virtual IFX_FileAccess* GetNext(FX_POSITION& pos) = 0;
 };
 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(
       uint16_t wCodePage,
       uint32_t dwFontStyles,
       const FX_WCHAR* pszFontFamily = NULL) = 0;
   virtual IFX_Font* GetDefFontByCharset(
       uint8_t nCharset,
       uint32_t dwFontStyles,
       const FX_WCHAR* pszFontFamily = NULL) = 0;
@@ skipping 30 matching lines @@
                              int32_t iFaceIndex,
                              int32_t* pFaceCount = NULL) = 0;
   virtual IFX_Font* LoadFont(IFX_Stream* pFontStream,
                              int32_t iFaceIndex,
                              int32_t* pFaceCount = NULL,
                              FX_BOOL bSaveStream = FALSE) = 0;
 
   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_