Remove IFX_FontEnumerator

core/fxge/include/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_FXGE_INCLUDE_FX_FONT_H_
 #define CORE_FXGE_INCLUDE_FX_FONT_H_
 
 #include <map>
@@ skipping 269 matching lines @@
   bool GetBuiltinFont(size_t index, const uint8_t** pFontData, uint32_t* size);
   CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper.get(); }
   FXFT_Library GetFTLibrary() const { return m_FTLibrary; }
 
  private:
   std::unique_ptr<CFX_FontMapper> m_pBuiltinMapper;
   std::map<CFX_ByteString, CTTFontDesc*> m_FaceMap;
   FXFT_Library m_FTLibrary;
 };
 
-class IFX_FontEnumerator {
- public:
-  virtual void HitFont() = 0;
-
-  virtual void Finish() = 0;
-
- protected:
-  virtual ~IFX_FontEnumerator() {}
-};
-
 class IFX_AdditionalFontEnum {
  public:
   virtual int CountFiles() = 0;
   virtual IFX_FileStream* GetFontFile(int index) = 0;
 
  protected:
   virtual ~IFX_AdditionalFontEnum() {}
 };
 
 class CFX_FontMapper {
  public:
   explicit CFX_FontMapper(CFX_FontMgr* mgr);
   ~CFX_FontMapper();
 
   void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
   IFX_SystemFontInfo* GetSystemFontInfo() { return m_pFontInfo; }
   void AddInstalledFont(const CFX_ByteString& name, int charset);
   void LoadInstalledFonts();
   std::vector<CFX_ByteString> m_InstalledTTFonts;

[Tom Sepez, 2016/04/06 20:35:13]

nit: move this public member below last public method.

[dsinclair, 2016/04/06 20:39:19]

Done.

-  void SetFontEnumerator(IFX_FontEnumerator* pFontEnumerator) {
-    m_pFontEnumerator = pFontEnumerator;
-  }
-  IFX_FontEnumerator* GetFontEnumerator() const { return m_pFontEnumerator; }
+
   FXFT_Face FindSubstFont(const CFX_ByteString& face_name,
                           FX_BOOL bTrueType,
                           uint32_t flags,
                           int weight,
                           int italic_angle,
                           int CharsetCP,
                           CFX_SubstFont* pSubstFont);
 #ifdef PDF_ENABLE_XFA
   FXFT_Face FindSubstFontByUnicode(uint32_t dwUnicode,
                                    uint32_t flags,
@@ skipping 16 matching lines @@
                              int weight,
                              int picthfamily);
 
   FX_BOOL m_bListLoaded;
   FXFT_Face m_MMFaces[MM_FACE_COUNT];
   CFX_ByteString m_LastFamily;
   CFX_ArrayTemplate<uint32_t> m_CharsetArray;
   std::vector<CFX_ByteString> m_FaceArray;
   IFX_SystemFontInfo* m_pFontInfo;
   FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
-  IFX_FontEnumerator* m_pFontEnumerator;
   CFX_FontMgr* const m_pFontMgr;
 };
 
 class IFX_SystemFontInfo {
  public:
   static IFX_SystemFontInfo* CreateDefault(const char** pUserPaths);
   virtual void Release() = 0;
 
   virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) = 0;
   virtual void* MapFont(int weight,
@@ skipping 187 matching lines @@
   virtual ~IFX_GSUBTable() {}
 };
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table,
                              uint32_t name_table_size,
                              uint32_t name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_FXGE_INCLUDE_FX_FONT_H_