Kill IFX_FontMapper

core/include/fxge/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_INCLUDE_FXGE_FX_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
 
 #include "../fxcrt/fx_system.h"
 #include "fx_dib.h"
 
 typedef struct FT_FaceRec_* FXFT_Face;
 typedef void* FXFT_Library;
 class IFX_FontEncoding;
 class CFX_PathData;
 class CFX_SubstFont;
 class CFX_FaceCache;
-class IFX_FontMapper;
 class CFX_FontMapper;
 class IFX_SystemFontInfo;
 class CFontFileFaceInfo;
 #define FXFONT_FIXED_PITCH              0x01
 #define FXFONT_SERIF                    0x02
 #define FXFONT_SYMBOLIC                 0x04
 #define FXFONT_SCRIPT                   0x08
 #define FXFONT_ITALIC                   0x40
 #define FXFONT_BOLD                             0x40000
 #define FXFONT_USEEXTERNATTR    0x80000
@@ skipping 185 matching lines @@
     FXFT_Face           GetFixedFace(const uint8_t* pData, FX_DWORD size, int face_index);
     void                        ReleaseFace(FXFT_Face face);
     void                        SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
     FXFT_Face           FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
                                   int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont);
 
     void                        FreeCache();
 
     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:
     virtual ~IFX_FontEnumerator() { }
 
     virtual void                HitFont() = 0;
 
     virtual void                Finish() = 0;
 };
 class IFX_AdditionalFontEnum
 {
 public:
     virtual ~IFX_AdditionalFontEnum() { }
     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();
+    CFX_FontMapper(CFX_FontMgr* mgr);

[Lei Zhang, 2015/07/31 20:23:30]

explicit

+    ~CFX_FontMapper();
+
     void                                SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
     IFX_SystemFontInfo* GetSystemFontInfo()
     {
         return m_pFontInfo;
     }
     void                                AddInstalledFont(const CFX_ByteString& name, int charset);
     void                                LoadInstalledFonts();
     CFX_ByteStringArray m_InstalledTTFonts;
     void                                SetFontEnumerator(IFX_FontEnumerator* pFontEnumerator)
     {
         m_pFontEnumerator = pFontEnumerator;
     }
     IFX_FontEnumerator* GetFontEnumerator() const
     {
         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);
 private:
     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);
 
     FX_BOOL                             m_bListLoaded;
     FXFT_Face                   m_MMFaces[2];
     CFX_ByteString              m_LastFamily;
     CFX_DWordArray              m_CharsetArray;
     CFX_ByteStringArray m_FaceArray;
     IFX_SystemFontInfo* m_pFontInfo;
     FXFT_Face                   m_FoxitFaces[14];
     IFX_FontEnumerator*         m_pFontEnumerator;
+    CFX_FontMgr* const m_pFontMgr;
+

[Lei Zhang, 2015/07/31 20:23:30]

Extra blank line here?

 };
 class IFX_SystemFontInfo
 {
 public:
     static IFX_SystemFontInfo*  CreateDefault();
     virtual void                Release() = 0;
 
     virtual     FX_BOOL         EnumFontList(CFX_FontMapper* pMapper) = 0;
     virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, int& iExact) = 0;
     virtual void*               GetFont(const FX_CHAR* face) = 0;
@@ skipping 119 matching lines @@
                    CFX_AffineMatrix* pText_matrix, unsigned short const* text, unsigned long argb);
 class IFX_GSUBTable
 {
 public:
     static IFX_GSUBTable* Create(CFX_Font* pFont);
     virtual ~IFX_GSUBTable() { }
     virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_