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/fwl/theme | |
| 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/fwl/theme')
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.cpp | 6 | ||||
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index bbcbabbb54..80a7b8fe4a 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -10,7 +10,7 @@ #include "xfa/fde/tto/fde_textout.h" #include "xfa/fgas/font/fgas_gefont.h" -#include "xfa/fgas/font/fgas_stdfontmgr.h" +#include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_themetext.h" @@ -664,10 +664,10 @@ bool CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily, m_dwCodePage = dwCodePage; if (!m_pFontMgr) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - m_pFontMgr = IFGAS_FontMgr::Create(FX_GetDefFontEnumerator()); + m_pFontMgr = CFGAS_FontMgr::Create(FX_GetDefFontEnumerator()); #else m_pFontSource.reset(new CFX_FontSourceEnum_File); - m_pFontMgr = IFGAS_FontMgr::Create(m_pFontSource.get()); + m_pFontMgr = CFGAS_FontMgr::Create(m_pFontSource.get()); #endif } m_pFont.reset(CFGAS_GEFont::LoadFont(wsFontFamily.c_str(), dwFontStyles, diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 73625d05d8..4a9ef1347b 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -96,7 +96,7 @@ class CFGAS_GEFont; class CFWL_ThemeBackground; class CFWL_ThemePart; class CFWL_ThemeText; -class IFGAS_FontMgr; +class CFGAS_FontMgr; class IFWL_Widget; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ @@ -245,7 +245,7 @@ class CFWL_FontData { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ std::unique_ptr<CFX_FontSourceEnum_File> m_pFontSource; #endif - std::unique_ptr<IFGAS_FontMgr> m_pFontMgr; + std::unique_ptr<CFGAS_FontMgr> m_pFontMgr; std::unique_ptr<CFGAS_GEFont> m_pFont; }; |