From 19319b7d047e50c54ff845715553adf4652cd793 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 01:31:18 -0700 Subject: Roll build_revision to bff6ee8. Also roll buildtools_revision to f90f6a5 and update Android code that did not previously pass the Chromium style plugin. TBR=dsinclair@chromium.org Change-Id: Ifb1193cee8f68ac99a31c8d43195e4d7005eeafb Reviewed-on: https://pdfium-review.googlesource.com/11293 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- core/fxge/android/cfpf_skiafontdescriptor.h | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'core/fxge/android/cfpf_skiafontdescriptor.h') diff --git a/core/fxge/android/cfpf_skiafontdescriptor.h b/core/fxge/android/cfpf_skiafontdescriptor.h index f653050feb..00a19ecc54 100644 --- a/core/fxge/android/cfpf_skiafontdescriptor.h +++ b/core/fxge/android/cfpf_skiafontdescriptor.h @@ -13,23 +13,13 @@ class CFPF_SkiaFontDescriptor { public: - CFPF_SkiaFontDescriptor() - : m_pFamily(nullptr), - m_dwStyle(0), - m_iFaceIndex(0), - m_dwCharsets(0), - m_iGlyphNum(0) {} - virtual ~CFPF_SkiaFontDescriptor() { FX_Free(m_pFamily); } - - virtual int32_t GetType() const { return FPF_SKIAFONTTYPE_Unknown; } - - void SetFamily(const char* pFamily) { - FX_Free(m_pFamily); - int32_t iSize = FXSYS_strlen(pFamily); - m_pFamily = FX_Alloc(char, iSize + 1); - memcpy(m_pFamily, pFamily, iSize * sizeof(char)); - m_pFamily[iSize] = 0; - } + CFPF_SkiaFontDescriptor(); + virtual ~CFPF_SkiaFontDescriptor(); + + virtual int32_t GetType() const; + + void SetFamily(const char* pFamily); + char* m_pFamily; uint32_t m_dwStyle; int32_t m_iFaceIndex; -- cgit v1.2.3