summaryrefslogtreecommitdiff
path: root/xfa/fwl/theme
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-06-03 16:02:17 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-03 16:02:17 -0700
commit16e587e9c34d713bb15c853e11891f0cf4d5f140 (patch)
treefd2460fb421d784a721615ea61c6082a7628ccd6 /xfa/fwl/theme
parent8d4e0d47f4cd0325be84ebf310fd8de989761939 (diff)
downloadpdfium-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/fwl/theme')
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.cpp4
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index df0cedbab5..1b437ebe9b 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -705,10 +705,10 @@ FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
m_dwCodePage = dwCodePage;
if (!m_pFontMgr) {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
- m_pFontMgr = IFX_FontMgr::Create(FX_GetDefFontEnumerator());
+ m_pFontMgr = IFGAS_FontMgr::Create(FX_GetDefFontEnumerator());
#else
m_pFontSource = new CFX_FontSourceEnum_File;
- m_pFontMgr = IFX_FontMgr::Create(m_pFontSource);
+ m_pFontMgr = IFGAS_FontMgr::Create(m_pFontSource);
#endif
}
m_pFont = IFGAS_Font::LoadFont(wsFontFamily.c_str(), dwFontStyles, dwCodePage,
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index 296d65f1af..971b6f09b1 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -94,7 +94,7 @@ enum class CFWL_WidgetCapacity {
class IFWL_Widget;
class CFDE_TextOut;
class IFGAS_Font;
-class IFX_FontMgr;
+class IFGAS_FontMgr;
class CFWL_ArrowData;
class CFWL_ThemeBackground;
class CFWL_ThemePart;
@@ -271,7 +271,7 @@ class CFWL_FontData {
uint32_t m_dwStyles;
uint32_t m_dwCodePage;
IFGAS_Font* m_pFont;
- IFX_FontMgr* m_pFontMgr;
+ IFGAS_FontMgr* m_pFontMgr;
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
CFX_FontSourceEnum_File* m_pFontSource;
#endif