Use smart pointers for CFX_Font and CFX_Type3Font classes

core/fxge/include/fx_font.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 CORE_FXGE_INCLUDE_FX_FONT_H_
 #define CORE_FXGE_INCLUDE_FX_FONT_H_
 
 #include <map>
@@ skipping 68 matching lines @@
   void LoadSubst(const CFX_ByteString& face_name,
                  FX_BOOL bTrueType,
                  uint32_t flags,
                  int weight,
                  int italic_angle,
                  int CharsetCP,
                  FX_BOOL bVertical = FALSE);
 
   FX_BOOL LoadEmbedded(const uint8_t* data, uint32_t size);
   FXFT_Face GetFace() const { return m_Face; }
-  CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
+  CFX_SubstFont* GetSubstFont() const { return m_pSubstFont.get(); }
 
 #ifdef PDF_ENABLE_XFA
   FX_BOOL LoadFile(IFX_FileRead* pFile,
                    int nFaceIndex = 0,
                    int* pFaceCount = nullptr);
 
   FX_BOOL LoadClone(const CFX_Font* pFont);
   void SetFace(FXFT_Face face) { m_Face = face; }
-  void SetSubstFont(CFX_SubstFont* subst) { m_pSubstFont = subst; }
+  void SetSubstFont(std::unique_ptr<CFX_SubstFont> subst) {
+    m_pSubstFont = std::move(subst);
+  }
 #endif  // PDF_ENABLE_XFA
 
   CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);
   int GetGlyphWidth(uint32_t glyph_index);
   int GetAscent() const;
   int GetDescent() const;
   FX_BOOL GetGlyphBBox(uint32_t glyph_index, FX_RECT& bbox);
   FX_BOOL IsItalic() const;
   FX_BOOL IsBold() const;
   FX_BOOL IsFixedWidth() const;
@@ skipping 23 matching lines @@
   CFX_BinaryBuf m_OtfFontData;
   FX_BOOL m_bLogic;
   void* m_pOwnedStream;
 #endif  // PDF_ENABLE_XFA
 
  private:
   void ReleasePlatformResource();
   void DeleteFace();
 
   FXFT_Face m_Face;
-  CFX_SubstFont* m_pSubstFont;
-  uint8_t* m_pFontDataAllocation;
+  std::unique_ptr<CFX_SubstFont> m_pSubstFont;
+  std::vector<uint8_t> m_pFontDataAllocation;
   uint8_t* m_pFontData;
   uint8_t* m_pGsubData;
   uint32_t m_dwSize;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   void* m_pPlatformFont;
 #endif
   FX_BOOL m_bEmbedded;
   FX_BOOL m_bVertical;
 };
 
@@ skipping 340 matching lines @@
 };
 
 class CFX_AutoFontCache {
  public:
   CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont)
       : m_pFontCache(pFontCache), m_pFont(pFont) {}
   ~CFX_AutoFontCache() { m_pFontCache->ReleaseCachedFace(m_pFont); }
   CFX_FontCache* m_pFontCache;
   CFX_Font* m_pFont;
 };
+
 #define FX_FONTCACHE_DEFINE(pFontCache, pFont) \
   CFX_AutoFontCache autoFontCache((pFontCache), (pFont))
 class CFX_GlyphBitmap {
  public:
   int m_Top;
   int m_Left;
   CFX_DIBitmap m_Bitmap;
 };
+
 class CFX_FaceCache {
  public:
   explicit CFX_FaceCache(FXFT_Face face);
   ~CFX_FaceCache();
   const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont,
                                          uint32_t glyph_index,
                                          FX_BOOL bFontStyle,
                                          const CFX_Matrix* pMatrix,
                                          int dest_width,
                                          int anti_alias,
@@ skipping 50 matching lines @@
                            FX_FLOAT retinaScaleX = 1.0f,
                            FX_FLOAT retinaScaleY = 1.0f);
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table,
                              uint32_t name_table_size,
                              uint32_t name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_FXGE_INCLUDE_FX_FONT_H_