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.cpp | |
| 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.cpp')
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index b78cfe516a..8a6ff28b43 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -20,7 +20,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFontFamily, uint32_t dwFontStyles, uint16_t wCodePage, - IFGAS_FontMgr* pFontMgr) { + CFGAS_FontMgr* pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (pFontMgr) return pFontMgr->GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily); @@ -37,7 +37,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFontFamily, // static CFGAS_GEFont* CFGAS_GEFont::LoadFont(CFX_Font* pExternalFont, - IFGAS_FontMgr* pFontMgr) { + CFGAS_FontMgr* pFontMgr) { CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr); if (!pFont->LoadFontInternal(pExternalFont)) { pFont->Release(); @@ -48,7 +48,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(CFX_Font* pExternalFont, // static CFGAS_GEFont* CFGAS_GEFont::LoadFont(std::unique_ptr<CFX_Font> pInternalFont, - IFGAS_FontMgr* pFontMgr) { + CFGAS_FontMgr* pFontMgr) { CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr); if (!pFont->LoadFontInternal(std::move(pInternalFont))) { pFont->Release(); @@ -61,7 +61,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(std::unique_ptr<CFX_Font> pInternalFont, // static CFGAS_GEFont* CFGAS_GEFont::LoadFont(const uint8_t* pBuffer, int32_t iLength, - IFGAS_FontMgr* pFontMgr) { + CFGAS_FontMgr* pFontMgr) { CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr); if (!pFont->LoadFontInternal(pBuffer, iLength)) { pFont->Release(); @@ -72,7 +72,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(const uint8_t* pBuffer, // static CFGAS_GEFont* CFGAS_GEFont::LoadFont(IFX_Stream* pFontStream, - IFGAS_FontMgr* pFontMgr, + CFGAS_FontMgr* pFontMgr, bool bSaveStream) { CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr); if (!pFont->LoadFontInternal(pFontStream, bSaveStream)) { @@ -83,7 +83,7 @@ CFGAS_GEFont* CFGAS_GEFont::LoadFont(IFX_Stream* pFontStream, } #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -CFGAS_GEFont::CFGAS_GEFont(IFGAS_FontMgr* pFontMgr) +CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr) : #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ m_bUseLogFontStyle(false), |