Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(922)

Unified Diff: core/include/fxge/fx_font.h

Issue 1287193005: Use override in more classes in fpdfsdk/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: nits, rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/include/fxge/fx_font.h
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index ce06a8ac5f4a44ba3aa01d3e28acb10251ab3731..8e0f5a1615d99d6d149bf5f2004e58bd2ec267c5 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -14,13 +14,13 @@
typedef struct FT_FaceRec_* FXFT_Face;
typedef void* FXFT_Library;
-class IFX_FontEncoding;
-class CFX_PathData;
-class CFX_SubstFont;
+class CFontFileFaceInfo;
class CFX_FaceCache;
class CFX_FontMapper;
+class CFX_PathData;
+class CFX_SubstFont;
class IFX_SystemFontInfo;
-class CFontFileFaceInfo;
+
#define FXFONT_FIXED_PITCH 0x01
#define FXFONT_SERIF 0x02
#define FXFONT_SYMBOLIC 0x04
@@ -133,6 +133,7 @@ class CFX_Font {
};
#define ENCODING_INTERNAL 0
#define ENCODING_UNICODE 1
+
class IFX_FontEncoding {
public:
virtual ~IFX_FontEncoding() {}
@@ -143,6 +144,7 @@ class IFX_FontEncoding {
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
@@ -228,20 +230,26 @@ class CFX_FontMgr {
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);
@@ -433,11 +441,14 @@ FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos,
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 ~IFX_GSUBTable() {}
virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
+
+ protected:
+ virtual ~IFX_GSUBTable() {}
};
#endif // CORE_INCLUDE_FXGE_FX_FONT_H_
« no previous file with comments | « no previous file | fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698