Merge to XFA: 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 CFontFileFaceInfo;
+class CFX_FaceCache;
+class CFX_FontMapper;
 class CFX_PathData;
 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_EXACTMATCH 0x80000000
 #define FXFONT_CIDFONT 0x100000
 #define FXFONT_ANSI_CHARSET 0
@@ skipping 98 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:
   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 FXFM_ENC_TAG(a, b, c, d)                                          \
   (((FX_DWORD)(a) << 24) | ((FX_DWORD)(b) << 16) | ((FX_DWORD)(c) << 8) | \
    (FX_DWORD)(d))
 #define FXFM_ENCODING_NONE FXFM_ENC_TAG(0, 0, 0, 0)
 #define FXFM_ENCODING_MS_SYMBOL FXFM_ENC_TAG('s', 'y', 'm', 'b')
 #define FXFM_ENCODING_UNICODE FXFM_ENC_TAG('u', 'n', 'i', 'c')
 #define FXFM_ENCODING_MS_SJIS FXFM_ENC_TAG('s', 'j', 'i', 's')
 #define FXFM_ENCODING_MS_GB2312 FXFM_ENC_TAG('g', 'b', ' ', ' ')
 #define FXFM_ENCODING_MS_BIG5 FXFM_ENC_TAG('b', 'i', 'g', '5')
@@ skipping 93 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:
   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();
   CFX_ByteStringArray m_InstalledTTFonts;
@@ skipping 191 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_