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_skiapathfont.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 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 8b7a4f9fb4..6cba42acff 100644 --- a/core/fxge/android/cfpf_skiapathfont.h +++ b/core/fxge/android/cfpf_skiapathfont.h @@ -14,19 +14,14 @@ class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor { public: - CFPF_SkiaPathFont() : m_pPath(nullptr) {} - ~CFPF_SkiaPathFont() override { FX_Free(m_pPath); } + CFPF_SkiaPathFont(); + ~CFPF_SkiaPathFont() override; // CFPF_SkiaFontDescriptor - int32_t GetType() const override { return FPF_SKIAFONTTYPE_Path; } - - void SetPath(const char* pPath) { - FX_Free(m_pPath); - int32_t iSize = FXSYS_strlen(pPath); - m_pPath = FX_Alloc(char, iSize + 1); - memcpy(m_pPath, pPath, iSize * sizeof(char)); - m_pPath[iSize] = 0; - } + int32_t GetType() const override; + + void SetPath(const char* pPath); + char* m_pPath; }; -- cgit v1.2.3