diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-14 14:07:43 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 14:07:43 -0700 |
| commit | c2c3f7b5f0396409451a9d344f35ec1929a76e9f (patch) | |
| tree | b1c696afdca13e8087e18014b19a6c82415f72d5 /core/include/fxge/fx_font.h | |
| parent | c6540e037ed1a9546d5a90455bf440a24b181ab4 (diff) | |
| download | pdfium-c2c3f7b5f0396409451a9d344f35ec1929a76e9f.tar.xz | |
Use override in more classes in core/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1292613003 .
Diffstat (limited to 'core/include/fxge/fx_font.h')
| -rw-r--r-- | core/include/fxge/fx_font.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 50cbba8e26..ce06a8ac5f 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -244,7 +244,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); @@ -283,6 +283,7 @@ class CFX_FontMapper { IFX_FontEnumerator* m_pFontEnumerator; CFX_FontMgr* const m_pFontMgr; }; + class IFX_SystemFontInfo { public: static IFX_SystemFontInfo* CreateDefault(const char** pUserPaths); @@ -307,12 +308,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); // IFX_SytemFontInfo: |