Use smart pointers for class owned pointers

fpdfsdk/pdfwindow/PWL_FontMap.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_
 #define FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_
 
+#include <memory>
+
 #include "core/fpdfdoc/include/ipvt_fontmap.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 #include "public/fpdf_sysfontinfo.h"
 
 class CPDF_Document;
 class CFX_SystemHandler;
 
 struct CPWL_FontMap_Data {
   CPDF_Font* pFont;
   int32_t nCharset;
@@ skipping 24 matching lines @@
 #define VIETNAMESE_CHARSET 163
 #define THAI_CHARSET 222
 #define EASTEUROPE_CHARSET 238
 #define RUSSIAN_CHARSET 204
 #define BALTIC_CHARSET 186
 
 #endif
 
 class CPWL_FontMap : public IPVT_FontMap {
  public:
+  using CharsetFontMap = FPDF_CharsetFontMap;

[dsinclair, 2016/08/03 12:47:55]

Is this useful? Seems like it just saves 5 chars but hides the implementation
class?

[Wei Li, 2016/08/03 17:54:47]

Removed it.

+
   CPWL_FontMap(CFX_SystemHandler* pSystemHandler);
   ~CPWL_FontMap() override;
 
   // IPVT_FontMap
   CPDF_Font* GetPDFFont(int32_t nFontIndex) override;
   CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) override;
   int32_t GetWordFontIndex(uint16_t word,
                            int32_t nCharset,
                            int32_t nFontIndex) override;
   int32_t CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) override;
   int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) override;
 
   void SetSystemHandler(CFX_SystemHandler* pSystemHandler);
   int32_t GetFontMapCount() const;
   const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const;
   static int32_t GetNativeCharset();
   CFX_ByteString GetNativeFontName(int32_t nCharset);
 
   static CFX_ByteString GetDefaultFontByCharset(int32_t nCharset);
 
   CPDF_Font* AddFontToDocument(CPDF_Document* pDoc,
                                CFX_ByteString& sFontName,
                                uint8_t nCharset);
   static FX_BOOL IsStandardFont(const CFX_ByteString& sFontName);
   CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName);
   CPDF_Font* AddSystemFont(CPDF_Document* pDoc,
                            CFX_ByteString& sFontName,
                            uint8_t nCharset);
 
+  static const CharsetFontMap defaultTTFMap[];
+
  protected:
   virtual void Initialize();
   virtual CPDF_Document* GetDocument();
   virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias,
                                          int32_t nCharset);
   virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
 
   FX_BOOL KnowWord(int32_t nFontIndex, uint16_t word);
 
   void Empty();
   int32_t GetFontIndex(const CFX_ByteString& sFontName,
                        int32_t nCharset,
                        FX_BOOL bFind);
   int32_t GetPWLFontIndex(uint16_t word, int32_t nCharset);
   int32_t AddFontData(CPDF_Font* pFont,
                       const CFX_ByteString& sFontAlias,
                       int32_t nCharset = DEFAULT_CHARSET);
 
   CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName,
                                  int32_t nCharset);
   CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName);
 
+  CFX_ArrayTemplate<CPWL_FontMap_Data*> m_aData;
+  CFX_ArrayTemplate<CPWL_FontMap_Native*> m_aNativeFont;
+
  private:
   CFX_ByteString GetFontName(int32_t nFontIndex);
   int32_t FindFont(const CFX_ByteString& sFontName,
                    int32_t nCharset = DEFAULT_CHARSET);
 
   CFX_ByteString GetNativeFont(int32_t nCharset);
 
- public:
-  using CharsetFontMap = FPDF_CharsetFontMap;
-  static const CharsetFontMap defaultTTFMap[];
-
- protected:
-  CFX_ArrayTemplate<CPWL_FontMap_Data*> m_aData;
-  CFX_ArrayTemplate<CPWL_FontMap_Native*> m_aNativeFont;
-
- private:
-  CPDF_Document* m_pPDFDoc;
+  std::unique_ptr<CPDF_Document> m_pPDFDoc;
   CFX_SystemHandler* m_pSystemHandler;
 };
 
 class CPWL_DocFontMap : public CPWL_FontMap {
  public:
   CPWL_DocFontMap(CFX_SystemHandler* pSystemHandler,
                   CPDF_Document* pAttachedDoc);
   ~CPWL_DocFontMap() override;
 
  private:
   // CPWL_FontMap:
   CPDF_Document* GetDocument() override;
 
   CPDF_Document* m_pAttachedDoc;
 };
 
 #endif  // FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_