diff options
| author | npm <npm@chromium.org> | 2016-11-11 17:16:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-11 17:16:23 -0800 |
| commit | 8f3eb6051c0465923d6694bd0f0b6dc5bb51cbe3 (patch) | |
| tree | df8f721cdf86d0c0cd3a0780bb55ac9a7a58f4f1 /xfa/fgas/font/fgas_gefont.h | |
| parent | c40697b24550182898b30de639790eaf82ebf158 (diff) | |
| download | pdfium-8f3eb6051c0465923d6694bd0f0b6dc5bb51cbe3.tar.xz | |
Remove IFGAS_FontMgr and clean up (the renamed) CFGAS_FontMgr a little.
IFGAS_FontMgr is an interface only for a class only defined on Windows,
plus a class only defined for non-Windows. I'm removing the interface,
renaming the class to have the same name in both cases, and cleaning up
a bit of unused methods.
Review-Url: https://codereview.chromium.org/2494883002
Diffstat (limited to 'xfa/fgas/font/fgas_gefont.h')
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h index 4ce61f3989..7baafefc7e 100644 --- a/xfa/fgas/font/fgas_gefont.h +++ b/xfa/fgas/font/fgas_gefont.h @@ -11,7 +11,7 @@ #include "core/fxcrt/fx_memory.h" #include "xfa/fgas/crt/fgas_utils.h" -#include "xfa/fgas/font/fgas_font.h" +#include "xfa/fgas/font/cfgas_fontmgr.h" #define FXFONT_SUBST_ITALIC 0x02 @@ -23,17 +23,17 @@ class CFGAS_GEFont { static CFGAS_GEFont* LoadFont(const FX_WCHAR* pszFontFamily, uint32_t dwFontStyles, uint16_t wCodePage, - IFGAS_FontMgr* pFontMgr); + CFGAS_FontMgr* pFontMgr); static CFGAS_GEFont* LoadFont(CFX_Font* pExternalFont, - IFGAS_FontMgr* pFontMgr); + CFGAS_FontMgr* pFontMgr); static CFGAS_GEFont* LoadFont(std::unique_ptr<CFX_Font> pInternalFont, - IFGAS_FontMgr* pFontMgr); + CFGAS_FontMgr* pFontMgr); #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static CFGAS_GEFont* LoadFont(const uint8_t* pBuffer, int32_t iLength, - IFGAS_FontMgr* pFontMgr); + CFGAS_FontMgr* pFontMgr); static CFGAS_GEFont* LoadFont(IFX_Stream* pFontStream, - IFGAS_FontMgr* pFontMgr, + CFGAS_FontMgr* pFontMgr, bool bSaveStream); #endif @@ -63,7 +63,7 @@ class CFGAS_GEFont { #endif protected: - explicit CFGAS_GEFont(IFGAS_FontMgr* pFontMgr); + explicit CFGAS_GEFont(CFGAS_FontMgr* pFontMgr); CFGAS_GEFont(CFGAS_GEFont* src, uint32_t dwFontStyles); #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ @@ -95,7 +95,7 @@ class CFGAS_GEFont { #endif CFX_Font* m_pFont; CFGAS_GEFont* const m_pSrcFont; - IFGAS_FontMgr* const m_pFontMgr; + CFGAS_FontMgr* const m_pFontMgr; int32_t m_iRefCount; bool m_bExternalFont; std::unique_ptr<IFX_Stream, ReleaseDeleter<IFX_Stream>> m_pStream; |