diff options
| author | tsepez <tsepez@chromium.org> | 2016-06-03 16:02:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-03 16:02:17 -0700 |
| commit | 16e587e9c34d713bb15c853e11891f0cf4d5f140 (patch) | |
| tree | fd2460fb421d784a721615ea61c6082a7628ccd6 /xfa/fgas/font/fgas_gefont.cpp | |
| parent | 8d4e0d47f4cd0325be84ebf310fd8de989761939 (diff) | |
| download | pdfium-16e587e9c34d713bb15c853e11891f0cf4d5f140.tar.xz | |
Rename IFX_FontMgr to IFGAS_FontMgr
Avoid confusion with CFX_FontMgr, which does not inherit
from IFX_FontMgr, and lives in a different layer of code.
Do the same CFX_ -> CFGAS_ transformation for the concrete
classes that implement IFGAS_FontMgr.
Review-Url: https://codereview.chromium.org/2039463003
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 f7c7331275..2c1296dffd 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -13,7 +13,7 @@ IFGAS_Font* IFGAS_Font::LoadFont(const FX_WCHAR* pszFontFamily, uint32_t dwFontStyles, uint16_t wCodePage, - IFX_FontMgr* pFontMgr) { + IFGAS_FontMgr* pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { return pFontMgr->GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily); @@ -30,7 +30,7 @@ IFGAS_Font* IFGAS_Font::LoadFont(const FX_WCHAR* pszFontFamily, } IFGAS_Font* IFGAS_Font::LoadFont(const uint8_t* pBuffer, int32_t iLength, - IFX_FontMgr* pFontMgr) { + IFGAS_FontMgr* pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { return pFontMgr->LoadFont(pBuffer, iLength, 0, NULL); @@ -46,7 +46,7 @@ IFGAS_Font* IFGAS_Font::LoadFont(const uint8_t* pBuffer, #endif } IFGAS_Font* IFGAS_Font::LoadFont(const FX_WCHAR* pszFileName, - IFX_FontMgr* pFontMgr) { + IFGAS_FontMgr* pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { return pFontMgr->LoadFont(pszFileName, 0, NULL); @@ -62,7 +62,7 @@ IFGAS_Font* IFGAS_Font::LoadFont(const FX_WCHAR* pszFileName, #endif } IFGAS_Font* IFGAS_Font::LoadFont(IFX_Stream* pFontStream, - IFX_FontMgr* pFontMgr, + IFGAS_FontMgr* pFontMgr, FX_BOOL bSaveStream) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { @@ -79,7 +79,7 @@ IFGAS_Font* IFGAS_Font::LoadFont(IFX_Stream* pFontStream, #endif } IFGAS_Font* IFGAS_Font::LoadFont(CFX_Font* pExtFont, - IFX_FontMgr* pFontMgr, + IFGAS_FontMgr* pFontMgr, FX_BOOL bTakeOver) { CFX_GEFont* pFont = new CFX_GEFont(pFontMgr); if (!pFont->LoadFont(pExtFont, bTakeOver)) { @@ -88,7 +88,7 @@ IFGAS_Font* IFGAS_Font::LoadFont(CFX_Font* pExtFont, } return pFont; } -CFX_GEFont::CFX_GEFont(IFX_FontMgr* pFontMgr) +CFX_GEFont::CFX_GEFont(IFGAS_FontMgr* pFontMgr) : #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ m_bUseLogFontStyle(FALSE), |