From 3f9a65a6bc254008625d6641ff9c54a40a64fb70 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 17 Aug 2018 23:50:02 +0000 Subject: Encapsulate CFPF_SkiaPathFont members. Use ByteString instead of char* for string data. Change-Id: I28dee8f3544b8b85ea46f2e8bc84249f32e368a0 Reviewed-on: https://pdfium-review.googlesource.com/40570 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- core/fxge/android/cfpf_skiapathfont.h | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'core/fxge/android/cfpf_skiapathfont.h') diff --git a/core/fxge/android/cfpf_skiapathfont.h b/core/fxge/android/cfpf_skiapathfont.h index e1d8994768..d091dc91c8 100644 --- a/core/fxge/android/cfpf_skiapathfont.h +++ b/core/fxge/android/cfpf_skiapathfont.h @@ -7,22 +7,33 @@ #ifndef CORE_FXGE_ANDROID_CFPF_SKIAPATHFONT_H_ #define CORE_FXGE_ANDROID_CFPF_SKIAPATHFONT_H_ +#include "core/fxcrt/bytestring.h" #include "core/fxcrt/fx_system.h" class CFPF_SkiaPathFont { public: - CFPF_SkiaPathFont(); + CFPF_SkiaPathFont(const ByteString& path, + const char* pFamily, + uint32_t dwStyle, + int32_t iFaceIndex, + uint32_t dwCharsets, + int32_t iGlyphNum); ~CFPF_SkiaPathFont(); - void SetPath(const char* pPath); - void SetFamily(const char* pFamily); + const char* path() const { return m_bsPath.c_str(); } + const char* family() const { return m_bsFamily.c_str(); } + uint32_t style() const { return m_dwStyle; } + int32_t face_index() const { return m_iFaceIndex; } + uint32_t charsets() const { return m_dwCharsets; } + int32_t glyph_num() const { return m_iGlyphNum; } - char* m_pPath = nullptr; - char* m_pFamily = nullptr; - uint32_t m_dwStyle = 0; - int32_t m_iFaceIndex = 0; - uint32_t m_dwCharsets = 0; - int32_t m_iGlyphNum = 0; + private: + const ByteString m_bsPath; + const ByteString m_bsFamily; + const uint32_t m_dwStyle; + const int32_t m_iFaceIndex; + const uint32_t m_dwCharsets; + const int32_t m_iGlyphNum; }; #endif // CORE_FXGE_ANDROID_CFPF_SKIAPATHFONT_H_ -- cgit v1.2.3