Merge to XFA: Kill CFX_Object.

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 _FX_FONT_H_
 #define _FX_FONT_H_
 #ifndef _FXCRT_EXTENSION_
 #include "../../include/fxcrt/fx_ext.h"
@@ skipping 33 matching lines @@
 #define FXFONT_GREEK_CHARSET    161
 #define FXFONT_TURKISH_CHARSET  162
 #define FXFONT_HEBREW_CHARSET   177
 #define FXFONT_ARABIC_CHARSET   178
 #define FXFONT_BALTIC_CHARSET   186
 #define FXFONT_FF_FIXEDPITCH    1
 #define FXFONT_FF_ROMAN                 (1<<4)
 #define FXFONT_FF_SCRIPT                (4<<4)
 #define FXFONT_FW_NORMAL                400
 #define FXFONT_FW_BOLD                  700
-class CFX_Font : public CFX_Object
+class CFX_Font 
 {
 public:
     CFX_Font();
     ~CFX_Font();
 
     FX_BOOL                                     LoadSubst(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
                                       int weight, int italic_angle, int CharsetCP, FX_BOOL bVertical = FALSE);
 
     FX_BOOL                                     LoadEmbedded(FX_LPCBYTE data, FX_DWORD size);
 
@@ skipping 78 matching lines @@
     void                                        DeleteFace();
 protected:
 
     FX_BOOL                                     m_bEmbedded;
     FX_BOOL                                     m_bVertical;
     FX_BOOL                 m_bLogic;
     void*                                       m_pOwnedStream;
 };
 #define ENCODING_INTERNAL               0
 #define ENCODING_UNICODE                1
-class IFX_FontEncoding : public CFX_Object
+class IFX_FontEncoding 
 {
 public:
     virtual ~IFX_FontEncoding() {}
 
     virtual FX_DWORD            GlyphFromCharCode(FX_DWORD charcode) = 0;
 
     virtual CFX_WideString      UnicodeFromCharCode(FX_DWORD charcode) const = 0;
 
     virtual FX_DWORD            CharCodeFromUnicode(FX_WCHAR Unicode) const = 0;
 };
@@ skipping 24 matching lines @@
     virtual FX_DWORD            CharCodeFromGlyphIndex(FX_DWORD dwGlyphIndex) = 0;
 };
 IFX_FontEncodingEx*     FX_CreateFontEncodingEx(CFX_Font* pFont, FX_DWORD nEncodingID = FXFM_ENCODING_NONE);
 #define FXFONT_SUBST_MM                         0x01
 #define FXFONT_SUBST_GLYPHPATH          0x04
 #define FXFONT_SUBST_CLEARTYPE          0x08
 #define FXFONT_SUBST_TRANSFORM          0x10
 #define FXFONT_SUBST_NONSYMBOL          0x20
 #define FXFONT_SUBST_EXACT                      0x40
 #define FXFONT_SUBST_STANDARD           0x80
-class CFX_SubstFont : public CFX_Object
+class CFX_SubstFont 
 {
 public:
 
     CFX_SubstFont();
 
     FX_LPVOID                           m_ExtHandle;
 
     CFX_ByteString                      m_Family;
 
     int                                         m_Charset;
@@ skipping 14 matching lines @@
 #define FX_FONT_FLAG_FIXEDPITCH                 0x02
 #define FX_FONT_FLAG_ITALIC                             0x04
 #define FX_FONT_FLAG_BOLD                               0x08
 #define FX_FONT_FLAG_SYMBOLIC_SYMBOL    0x10
 #define FX_FONT_FLAG_SYMBOLIC_DINGBATS  0x20
 #define FX_FONT_FLAG_MULTIPLEMASTER             0x40
 typedef struct {
     FX_LPCBYTE  m_pFontData;
     FX_DWORD    m_dwSize;
 } FoxitFonts;
-class CFX_FontMgr : public CFX_Object
+class CFX_FontMgr 
 {
 public:
     CFX_FontMgr();
     ~CFX_FontMgr();
     void                        InitFTLibrary();
     FXFT_Face           GetCachedFace(const CFX_ByteString& face_name,
                                   int weight, FX_BOOL bItalic, FX_LPBYTE& pFontData);
     FXFT_Face           AddCachedFace(const CFX_ByteString& face_name,
                                   int weight, FX_BOOL bItalic, FX_LPBYTE pData, FX_DWORD size, int face_index);
     FXFT_Face           GetCachedTTCFace(int ttc_size, FX_DWORD checksum,
                                      int font_offset, FX_LPBYTE& pFontData);
     FXFT_Face           AddCachedTTCFace(int ttc_size, FX_DWORD checksum,
                                      FX_LPBYTE pData, FX_DWORD size, int font_offset);
     FXFT_Face           GetFileFace(FX_LPCSTR filename, int face_index);
     FXFT_Face           GetFixedFace(FX_LPCBYTE 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(FX_LPCBYTE& 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 CFX_Object
+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;
 };
@@ skipping 44 matching lines @@
 
     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;
 };
-class IFX_SystemFontInfo : public CFX_Object
+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, FX_LPCSTR face, FX_BOOL& bExact) = 0;
     virtual void*               MapFontByUnicode(FX_DWORD dwUnicode, int weight, FX_BOOL bItalic, int pitch_family)
     {
         return NULL;
@@ skipping 30 matching lines @@
     virtual     FX_BOOL         GetFaceName(void* hFont, CFX_ByteString& name);
     virtual FX_BOOL             GetFontCharset(void* hFont, int& charset);
 protected:
     CFX_MapByteStringToPtr      m_FontList;
     CFX_ByteStringArray m_PathList;
     CFX_FontMapper*             m_pMapper;
     void                                ScanPath(CFX_ByteString& path);
     void                                ScanFile(CFX_ByteString& path);
     void                                ReportFace(CFX_ByteString& path, FXSYS_FILE* pFile, FX_DWORD filesize, FX_DWORD offset);
 };
-class CFX_CountedFaceCache : public CFX_Object
+class CFX_CountedFaceCache 
 {
 public:
     CFX_FaceCache*      m_Obj;
     FX_DWORD            m_nCount;
 };
 typedef CFX_MapPtrTemplate<FXFT_Face, CFX_CountedFaceCache*> CFX_FTCacheMap;
-class CFX_FontCache : public CFX_Object
+class CFX_FontCache 
 {
 public:
     ~CFX_FontCache();
     CFX_FaceCache*                      GetCachedFace(CFX_Font* pFont);
     void                                        ReleaseCachedFace(CFX_Font* pFont);
     void                                        FreeCache(FX_BOOL bRelease = FALSE);
 
 private:
     CFX_FTCacheMap                      m_FTFaceMap;
     CFX_FTCacheMap                      m_ExtFaceMap;
 };
 class CFX_AutoFontCache
 {
 public:
     CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont)
         : m_pFontCache(pFontCache)
         , m_pFont(pFont)
     {
     }
     ~CFX_AutoFontCache()
     {
         m_pFontCache->ReleaseCachedFace(m_pFont);
     }
     CFX_FontCache* m_pFontCache;
     CFX_Font* m_pFont;
 };
 #define FX_FONTCACHE_DEFINE(pFontCache, pFont) CFX_AutoFontCache autoFontCache((pFontCache), (pFont))
-class CFX_GlyphBitmap : public CFX_Object
+class CFX_GlyphBitmap 
 {
 public:
     int                                         m_Top;
     int                                         m_Left;
     CFX_DIBitmap                        m_Bitmap;
 };
-class CFX_FaceCache : public CFX_Object
+class CFX_FaceCache 
 {
 public:
     ~CFX_FaceCache();
     const CFX_GlyphBitmap*      LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, const CFX_AffineMatrix* pMatrix,
                                             int dest_width, int anti_alias, int& text_flags);
     const CFX_PathData*         LoadGlyphPath(CFX_Font* pFont, FX_DWORD glyph_index, int dest_width);
 
 
     CFX_FaceCache(FXFT_Face face);
 private:
@@ skipping 32 matching lines @@
 {
 public:
     virtual void        Release() = 0;
     virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 
 protected:
      ~IFX_GSUBTable() { }
 };
 IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
 #endif