diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-08-17 20:40:52 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-17 20:40:52 +0000 |
| commit | 16208a0ef769a84c7e96ff5d55a16637ca01de03 (patch) | |
| tree | 3d1c284c605f5fe6ade43fbe499ed3f245bcb886 /core/fxge/android/cfpf_skiafont.h | |
| parent | 1b2b76d634ba3716ee43a553cd952927a7d262a2 (diff) | |
| download | pdfium-16208a0ef769a84c7e96ff5d55a16637ca01de03.tar.xz | |
Remove CFPF_SkiaFontDescriptor.
CFPF_SkiaFontDescriptor only has a single subclass. Merge it with the
subclass.
Change-Id: I26d19ee527c010d2d69acd820d8acc9634b12239
Reviewed-on: https://pdfium-review.googlesource.com/40551
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/android/cfpf_skiafont.h')
| -rw-r--r-- | core/fxge/android/cfpf_skiafont.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fxge/android/cfpf_skiafont.h b/core/fxge/android/cfpf_skiafont.h index 1b2f605838..260e4222a5 100644 --- a/core/fxge/android/cfpf_skiafont.h +++ b/core/fxge/android/cfpf_skiafont.h @@ -11,8 +11,8 @@ #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_font.h" -class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; +class CFPF_SkiaPathFont; class CFPF_SkiaFont { public: @@ -37,18 +37,18 @@ class CFPF_SkiaFont { uint32_t GetFontData(uint32_t dwTable, uint8_t* pBuffer, uint32_t dwSize); bool InitFont(CFPF_SkiaFontMgr* pFontMgr, - CFPF_SkiaFontDescriptor* pFontDes, + CFPF_SkiaPathFont* pFont, const ByteStringView& bsFamily, uint32_t dwStyle, uint8_t uCharset); private: UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; - UnownedPtr<CFPF_SkiaFontDescriptor> m_pFontDes; - FXFT_Face m_Face; - uint32_t m_dwStyle; - uint8_t m_uCharset; - uint32_t m_dwRefCount; + UnownedPtr<CFPF_SkiaPathFont> m_pFont; + FXFT_Face m_Face = nullptr; + uint32_t m_dwStyle = 0; + uint8_t m_uCharset = 0; + uint32_t m_dwRefCount = 0; }; #endif // CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_ |