From 5b10a4c713fbc831cc7bed16936b44ff65fd68b1 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 20 Aug 2018 17:01:06 +0000 Subject: Remove refcounting from CFPF_SkiaFont. 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 Commit-Queue: Lei Zhang --- core/fxge/android/cfpf_skiafont.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'core/fxge/android/cfpf_skiafont.h') 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 const m_pFontMgr; UnownedPtr 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_ -- cgit v1.2.3