From cddf8253692d3beaa97a502c8b60c1d18f81664a Mon Sep 17 00:00:00 2001 From: weili Date: Thu, 4 Aug 2016 15:43:59 -0700 Subject: Use smart pointers for class owned pointers under xfa/fde Use smart pointer to replace raw pointer type for class owned member variables so that memory management will be easier. BUG=pdfium:518 Review-Url: https://codereview.chromium.org/2208423002 --- xfa/fde/cfde_txtedtpage.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'xfa/fde/cfde_txtedtpage.h') diff --git a/xfa/fde/cfde_txtedtpage.h b/xfa/fde/cfde_txtedtpage.h index 9adaee1fdc..777f82929e 100644 --- a/xfa/fde/cfde_txtedtpage.h +++ b/xfa/fde/cfde_txtedtpage.h @@ -7,6 +7,9 @@ #ifndef XFA_FDE_CFDE_TXTEDTPAGE_H_ #define XFA_FDE_CFDE_TXTEDTPAGE_H_ +#include +#include + #include "xfa/fde/ifde_txtedtpage.h" #include "xfa/fde/ifx_chariter.h" @@ -60,8 +63,8 @@ class CFDE_TxtEdtPage : public IFDE_TxtEdtPage { FX_FLOAT fTolerance) const; std::unique_ptr m_pIter; - CFDE_TxtEdtTextSet* m_pTextSet; - CFDE_TxtEdtEngine* m_pEditEngine; + std::unique_ptr m_pTextSet; + CFDE_TxtEdtEngine* const m_pEditEngine; CFX_MassArrayTemplate m_PieceMassArr; CFDE_TxtEdtParag* m_pBgnParag; CFDE_TxtEdtParag* m_pEndParag; @@ -74,7 +77,7 @@ class CFDE_TxtEdtPage : public IFDE_TxtEdtPage { CFX_RectF m_rtPageMargin; CFX_RectF m_rtPageContents; CFX_RectF m_rtPageCanvas; - int32_t* m_pCharWidth; + std::vector m_CharWidths; }; #endif // XFA_FDE_CFDE_TXTEDTPAGE_H_ -- cgit v1.2.3