diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-27 12:47:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-27 12:47:01 -0700 |
| commit | 303e525325904cd9b6a847f48951510e7dd8a45e (patch) | |
| tree | dab3ff0e3bda317dc51ef0caf8d15daf88e7e6b8 /xfa/fwl | |
| parent | 43854a5073602a4613131aa6dbac5f7b9a095bcd (diff) | |
| download | pdfium-303e525325904cd9b6a847f48951510e7dd8a45e.tar.xz | |
More IFX_ interface cleanup.
Remove IFX_FontProvider, IFX_FontSourceEnum, IFX_SAXReader and
IFX_SAXReaderHandler.
Review-Url: https://codereview.chromium.org/1930533002
Diffstat (limited to 'xfa/fwl')
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.cpp | 3 | ||||
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 2fc8036763..5332b3bebd 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -9,6 +9,7 @@ #include <algorithm> #include "xfa/fde/tto/fde_textout.h" +#include "xfa/fgas/font/fgas_stdfontmgr.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_themetext.h" @@ -690,7 +691,7 @@ FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily, #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ m_pFontMgr = IFX_FontMgr::Create(FX_GetDefFontEnumerator()); #else - m_pFontSource = FX_CreateDefaultFontSourceEnum(); + m_pFontSource = new CFX_FontSourceEnum_File; m_pFontMgr = IFX_FontMgr::Create(m_pFontSource); #endif } diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 4e640370b8..8e5c8ba283 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -101,7 +101,7 @@ class CFWL_ThemePart; class CFWL_ThemeText; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ -class IFX_FontSourceEnum; +class CFX_FontSourceEnum_File; #endif class CFWL_WidgetTP { @@ -270,7 +270,7 @@ class CFWL_FontData { IFX_Font* m_pFont; IFX_FontMgr* m_pFontMgr; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ - IFX_FontSourceEnum* m_pFontSource; + CFX_FontSourceEnum_File* m_pFontSource; #endif }; |