Use override in more classes in fpdfsdk/

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;

[Tom Sepez, 2015/08/14 19:59:18]

nit: alphabetize while we're at it.

[Lei Zhang, 2015/08/14 21:23:49]

Done.

 class CFX_SubstFont;
 class CFX_FaceCache;
 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
 #define FXFONT_CIDFONT 0x100000
 #define FXFONT_ANSI_CHARSET 0
 #define FXFONT_DEFAULT_CHARSET 1
@@ skipping 92 matching lines @@
 
   void DeleteFace();
 
  protected:
   FX_BOOL m_bEmbedded;
   FX_BOOL m_bVertical;
   void* m_pOwnedStream;
 };
 #define ENCODING_INTERNAL 0
 #define ENCODING_UNICODE 1
+
 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;
 };
+
 IFX_FontEncoding* FXGE_CreateUnicodeEncoding(CFX_Font* pFont);
 #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:
@@ skipping 65 matching lines @@
                           CFX_SubstFont* pSubstFont);
 
   void FreeCache();
 
   FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index);
   CFX_FontMapper* m_pBuiltinMapper;
   CFX_MapByteStringToPtr m_FaceMap;
   FXFT_Library m_FTLibrary;
   FoxitFonts m_ExternalFonts[16];
 };
+
 class IFX_FontEnumerator {
  public:
-  virtual ~IFX_FontEnumerator() {}
-
   virtual void HitFont() = 0;
 
   virtual void Finish() = 0;
+
+ protected:
+  virtual ~IFX_FontEnumerator() {}
 };
+
 class IFX_AdditionalFontEnum {
  public:
-  virtual ~IFX_AdditionalFontEnum() {}
   virtual int CountFiles() = 0;
   virtual IFX_FileStream* GetFontFile(int index) = 0;
+
+ protected:
+  virtual ~IFX_AdditionalFontEnum() {}
 };
+
 class CFX_FontMapper {
  public:
   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();
   CFX_ByteStringArray m_InstalledTTFonts;
@@ skipping 21 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;
   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,
                         FX_BOOL bItalic,
                         int charset,
                         int pitch_family,
                         const FX_CHAR* face,
                         int& iExact) = 0;
   virtual void* GetFont(const FX_CHAR* face) = 0;
   virtual FX_DWORD GetFontData(void* hFont,
                                FX_DWORD table,
                                uint8_t* buffer,
                                FX_DWORD size) = 0;
   virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) = 0;
   virtual FX_BOOL GetFontCharset(void* hFont, int& charset) = 0;
   virtual int GetFaceIndex(void* hFont) { return 0; }
   virtual void DeleteFont(void* hFont) = 0;
   virtual void* RetainFont(void* hFont) { return NULL; }
 
  protected:
-  ~IFX_SystemFontInfo() {}
+  virtual ~IFX_SystemFontInfo() {}
 };
+
 class CFX_FolderFontInfo : public IFX_SystemFontInfo {
  public:
   CFX_FolderFontInfo();
   virtual ~CFX_FolderFontInfo();
   void AddPath(const CFX_ByteStringC& path);
 
   // IFX_SytemFontInfo:
   void Release() override;
   FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override;
   void* MapFont(int weight,
@@ skipping 102 matching lines @@
 typedef struct {
   const CFX_GlyphBitmap* m_pGlyph;
   int m_OriginX, m_OriginY;
   FX_FLOAT m_fOriginX, m_fOriginY;
 } FXTEXT_GLYPHPOS;
 FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos,
                            int nChars,
                            int anti_alias,
                            FX_FLOAT retinaScaleX = 1.0f,
                            FX_FLOAT retinaScaleY = 1.0f);
+
 class IFX_GSUBTable {
  public:
   static IFX_GSUBTable* Create(CFX_Font* pFont);
+  virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
+
+ protected:
   virtual ~IFX_GSUBTable() {}
-  virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_