From cffa651acfa7ca1d90aecea728e94c5c3dcdfe79 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 17 Aug 2018 20:44:22 +0000 Subject: Change CFPF_SkiaFontMgr::m_FontFaces to store unique_ptrs. Instead of raw pointers. Change-Id: Ie46af37bbe3fe287bdff25249afaeb90589c85b3 Reviewed-on: https://pdfium-review.googlesource.com/40552 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- core/fxge/android/cfpf_skiafontmgr.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/fxge/android/cfpf_skiafontmgr.h') diff --git a/core/fxge/android/cfpf_skiafontmgr.h b/core/fxge/android/cfpf_skiafontmgr.h index af2d3acfc8..99aafd7bd2 100644 --- a/core/fxge/android/cfpf_skiafontmgr.h +++ b/core/fxge/android/cfpf_skiafontmgr.h @@ -8,6 +8,7 @@ #define CORE_FXGE_ANDROID_CFPF_SKIAFONTMGR_H_ #include +#include #include #include "core/fxcrt/fx_string.h" @@ -35,11 +36,12 @@ class CFPF_SkiaFontMgr { private: void ScanPath(const ByteString& path); void ScanFile(const ByteString& file); - void ReportFace(FXFT_Face face, CFPF_SkiaPathFont* pFont); + std::unique_ptr ReportFace(FXFT_Face face, + const ByteString& file); bool m_bLoaded = false; FXFT_Library m_FTLibrary = nullptr; - std::vector m_FontFaces; + std::vector> m_FontFaces; std::map m_FamilyFonts; }; -- cgit v1.2.3