Index: xfa/fwl/theme/cfwl_widgettp.h |
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h |
index 8a1e0c152a6b21b1e4151e5afa87064cf45e1972..e6d09326c2495ca5e7dfaf7c5394a0a53ff1812c 100644 |
--- a/xfa/fwl/theme/cfwl_widgettp.h |
+++ b/xfa/fwl/theme/cfwl_widgettp.h |
@@ -236,23 +236,24 @@ class CFWL_FontData { |
public: |
CFWL_FontData(); |
virtual ~CFWL_FontData(); |
+ |
FX_BOOL Equal(const CFX_WideStringC& wsFontFamily, |
uint32_t dwFontStyles, |
uint16_t wCodePage); |
FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily, |
uint32_t dwFontStyles, |
uint16_t wCodePage); |
- CFGAS_GEFont* GetFont() const { return m_pFont; } |
+ CFGAS_GEFont* GetFont() const { return m_pFont.get(); } |
protected: |
CFX_WideString m_wsFamily; |
uint32_t m_dwStyles; |
uint32_t m_dwCodePage; |
- CFGAS_GEFont* m_pFont; |
- IFGAS_FontMgr* m_pFontMgr; |
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ |
- CFX_FontSourceEnum_File* m_pFontSource; |
+ std::unique_ptr<CFX_FontSourceEnum_File> m_pFontSource; |
#endif |
+ std::unique_ptr<IFGAS_FontMgr> m_pFontMgr; |
+ std::unique_ptr<CFGAS_GEFont> m_pFont; |
}; |
class CFWL_FontManager { |