summaryrefslogtreecommitdiff
path: root/core/include/fxge/fx_font.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-14 21:49:19 -0700
committerLei Zhang <thestig@chromium.org>2015-08-14 21:49:19 -0700
commit62b2e912dc2a508972fbf01b25f7449c39ff1543 (patch)
tree47a244dc5891b2a338ca529b796e12994e642cbc /core/include/fxge/fx_font.h
parentbdf72c353af5b8a34ef5efdeddfff36d2089a158 (diff)
downloadpdfium-62b2e912dc2a508972fbf01b25f7449c39ff1543.tar.xz
Merge to XFA: Use override in more classes in core/
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1292613003 . (cherry picked from commit c2c3f7b5f0396409451a9d344f35ec1929a76e9f) Review URL: https://codereview.chromium.org/1296043002 .
Diffstat (limited to 'core/include/fxge/fx_font.h')
-rw-r--r--core/include/fxge/fx_font.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 835a018112..e0c6e31542 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -278,7 +278,7 @@ class IFX_AdditionalFontEnum {
};
class CFX_FontMapper {
public:
- CFX_FontMapper(CFX_FontMgr* mgr);
+ explicit CFX_FontMapper(CFX_FontMgr* mgr);
~CFX_FontMapper();
void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
@@ -326,6 +326,7 @@ class CFX_FontMapper {
IFX_FontEnumerator* m_pFontEnumerator;
CFX_FontMgr* const m_pFontMgr;
};
+
class IFX_SystemFontInfo {
public:
static IFX_SystemFontInfo* CreateDefault();
@@ -356,12 +357,13 @@ class IFX_SystemFontInfo {
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();
+ ~CFX_FolderFontInfo() override;
void AddPath(const CFX_ByteStringC& path);