diff options
| author | weili <weili@chromium.org> | 2016-08-10 14:50:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-10 14:50:48 -0700 |
| commit | b4d1b576bccb5ca6cebe29288af014bd0f512af1 (patch) | |
| tree | 2d60839a8323eb6780c782aba4ae1123243c7355 /xfa/fwl/theme/cfwl_widgettp.h | |
| parent | 1194561d5d83869edecf6a1f402122a59955f0b7 (diff) | |
| download | pdfium-b4d1b576bccb5ca6cebe29288af014bd0f512af1.tar.xz | |
Use smart pointers for class owned pointers in xfa/fxfa
Use smart pointers instead of raw pointer to make memory management
easier for classes mainly under xfa/fxfa.
Also change the return type of IFGAS_FontMgr::Create() to smart
pointer type.
BUG=pdfium:518
Review-Url: https://codereview.chromium.org/2227883002
Diffstat (limited to 'xfa/fwl/theme/cfwl_widgettp.h')
| -rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 8a1e0c152a..e6d09326c2 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 { |