diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-25 15:53:57 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-25 23:07:41 +0000 |
| commit | d0409afc6a994a3e24043b8a96c83c022bcaa189 (patch) | |
| tree | 15fa78b8a601ec97fc8bee39f8e56590c37babe3 /core/fxge/android | |
| parent | 2eddb665763f3e089d4c210d2a011d112683f3ea (diff) | |
| download | pdfium-d0409afc6a994a3e24043b8a96c83c022bcaa189.tar.xz | |
Mass conversion of remaining class members (non-xfa)
Change-Id: I8365ba80e3395d59a3cf35dbd9d9162e86e712e3
Reviewed-on: https://pdfium-review.googlesource.com/5970
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/android')
| -rw-r--r-- | core/fxge/android/cfpf_skiafont.h | 5 | ||||
| -rw-r--r-- | core/fxge/android/cfx_androidfontinfo.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/fxge/android/cfpf_skiafont.h b/core/fxge/android/cfpf_skiafont.h index 657ced88f2..5686e9e31f 100644 --- a/core/fxge/android/cfpf_skiafont.h +++ b/core/fxge/android/cfpf_skiafont.h @@ -7,6 +7,7 @@ #ifndef CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_ #define CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_ +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_font.h" @@ -42,8 +43,8 @@ class CFPF_SkiaFont { uint8_t uCharset); private: - CFPF_SkiaFontMgr* m_pFontMgr; - CFPF_SkiaFontDescriptor* m_pFontDes; + CFX_UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; + CFX_UnownedPtr<CFPF_SkiaFontDescriptor> m_pFontDes; FXFT_Face m_Face; uint32_t m_dwStyle; uint8_t m_uCharset; diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h index ce08f2558a..17bbf89a3e 100644 --- a/core/fxge/android/cfx_androidfontinfo.h +++ b/core/fxge/android/cfx_androidfontinfo.h @@ -7,6 +7,7 @@ #ifndef CORE_FXGE_ANDROID_CFX_ANDROIDFONTINFO_H_ #define CORE_FXGE_ANDROID_CFX_ANDROIDFONTINFO_H_ +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/fx_font.h" @@ -39,7 +40,7 @@ class CFX_AndroidFontInfo : public IFX_SystemFontInfo { void DeleteFont(void* hFont) override; protected: - CFPF_SkiaFontMgr* m_pFontMgr; + CFX_UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; }; #endif // CORE_FXGE_ANDROID_CFX_ANDROIDFONTINFO_H_ |