diff options
author | Lei Zhang <thestig@chromium.org> | 2018-08-20 17:01:06 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-20 17:01:06 +0000 |
commit | 5b10a4c713fbc831cc7bed16936b44ff65fd68b1 (patch) | |
tree | a0e7d9c3ade6ec0318b5464cfcd14aefef23b3a1 /core/fxge/android/cfpf_skiafont.h | |
parent | 032b3bed2b1888f1226e1d940fe41e9a09d2336c (diff) | |
download | pdfium-5b10a4c713fbc831cc7bed16936b44ff65fd68b1.tar.xz |
Remove refcounting from CFPF_SkiaFont.chromium/3529
The refcounting is useless, since CFPF_SkiaFontMgr always has a
reference to the fonts anyway. Just make CFPF_SkiaFontMgr own the fonts,
like on other platforms.
Change-Id: Ifadb5c4e09f151ada4a0a68e0588166c2f2974d4
Reviewed-on: https://pdfium-review.googlesource.com/40610
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 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/fxge/android/cfpf_skiafont.h b/core/fxge/android/cfpf_skiafont.h index 4e3b02d892..0dfb14b238 100644 --- a/core/fxge/android/cfpf_skiafont.h +++ b/core/fxge/android/cfpf_skiafont.h @@ -20,9 +20,7 @@ class CFPF_SkiaFont { const CFPF_SkiaPathFont* pFont, uint32_t dwStyle, uint8_t uCharset); - - void Release(); - CFPF_SkiaFont* Retain(); + ~CFPF_SkiaFont(); bool IsValid() const { return !!m_Face; } @@ -41,14 +39,11 @@ class CFPF_SkiaFont { uint32_t GetFontData(uint32_t dwTable, uint8_t* pBuffer, uint32_t dwSize); private: - ~CFPF_SkiaFont(); - UnownedPtr<CFPF_SkiaFontMgr> const m_pFontMgr; UnownedPtr<const CFPF_SkiaPathFont> const m_pFont; const FXFT_Face m_Face; const uint32_t m_dwStyle; const uint8_t m_uCharset; - uint32_t m_dwRefCount = 0; }; #endif // CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_ |