Pdfium: Fix fonts leaking on ClosePage.

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 <memory>
 #include <vector>
 
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/cfx_substfont.h"
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_freetype.h"
 
 typedef struct FT_FaceRec_* FXFT_Face;
 typedef void* FXFT_Library;
 
 class CFX_FaceCache;
-class CFX_FontCache;
+class CFX_FontCacheItem;
+class CFX_GlyphBitmap;
 class CFX_PathData;
 class CFX_SizeGlyphCache;
 
 #ifdef _SKIA_SUPPORT_
 class SkTypeface;
 
 using CFX_TypeFace = SkTypeface;
 #endif
 
 #define FXFONT_FIXED_PITCH 0x01
@@ skipping 72 matching lines @@
                    int nFaceIndex = 0,
                    int* pFaceCount = nullptr);
 
   FX_BOOL LoadClone(const CFX_Font* pFont);
   void SetFace(FXFT_Face face) { m_Face = face; }
   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);
   bool IsItalic() const;
   bool IsBold() const;
   bool IsFixedWidth() const;
   FX_BOOL IsVertical() const { return m_bVertical; }
   CFX_ByteString GetPsName() const;
   CFX_ByteString GetFamilyName() const;
   CFX_ByteString GetFaceName() const;
   FX_BOOL IsTTFont() const;
   FX_BOOL GetBBox(FX_RECT& bbox);
   int GetHeight() const;
   int GetULPos() const;
   int GetULthickness() const;
   int GetMaxAdvanceWidth() const;
   FX_BOOL IsEmbedded() const { return m_bEmbedded; }
   uint8_t* GetSubData() const { return m_pGsubData; }
   void SetSubData(uint8_t* data) { m_pGsubData = data; }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   void* GetPlatformFont() const { return m_pPlatformFont; }
   void SetPlatformFont(void* font) { m_pPlatformFont = font; }
 #endif
   uint8_t* GetFontData() const { return m_pFontData; }
   uint32_t GetSize() const { return m_dwSize; }
   void AdjustMMParams(int glyph_index, int width, int weight);
 
+  const CFX_FontCacheItem* GetFontCache() const { return m_FontCache.get(); }

[dsinclair, 2016/09/14 17:51:51]

This isn't really a cache as it's always just one item? What do we need this
for?

[snake, 2016/09/14 19:06:29]

I did remove m_FontCache member, now CFX_Font translate calls to cache directly.

+  CFX_FaceCache* GetFaceCache() const;
+
   static const size_t kAngleSkewArraySize = 30;
   static const char s_AngleSkew[kAngleSkewArraySize];
   static const size_t kWeightPowArraySize = 100;
   static const uint8_t s_WeightPow[kWeightPowArraySize];
   static const uint8_t s_WeightPow_11[kWeightPowArraySize];
   static const uint8_t s_WeightPow_SHIFTJIS[kWeightPowArraySize];
 
 #ifdef PDF_ENABLE_XFA
  protected:
   CFX_BinaryBuf m_OtfFontData;
   bool m_bShallowCopy;
   FXFT_StreamRec* m_pOwnedStream;
 #endif  // PDF_ENABLE_XFA
 
  private:
+  friend class CFX_FaceCache;
+  CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);

[dsinclair, 2016/09/14 17:51:51]

Why not leave this public then we don't need the friend entry.

[snake, 2016/09/14 19:06:29]

This method is not using cache, for cleanly any caller should call method, which
use cache.

+
+ private:
   void ReleasePlatformResource();
   void DeleteFace();
 
+  void ClearFaceCache();
+
   FXFT_Face m_Face;
+  mutable CFX_FaceCache* m_FaceCache;

[dsinclair, 2016/09/14 17:51:51]

Why mutable?

What is the ownership of this? If it isn't owned by us can you add a:

  // not owned.

If it is owned, it should be a std::unique_ptr.

[snake, 2016/09/14 19:06:29]

It is initialized on demand in GetFaceCache() const getter.
In other case we should initialize it in much of initialization methods
(LoadSubst, LoadEmbeded, SetFace, ...)
Done

+  std::unique_ptr<CFX_FontCacheItem> m_FontCache;
   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;
 };
 
+class CFX_FontCacheItem {
+ public:
+  explicit CFX_FontCacheItem(CFX_Font* font);
+  ~CFX_FontCacheItem();
+
+  const CFX_GlyphBitmap* LoadGlyphBitmap(uint32_t glyph_index,
+                                         FX_BOOL bFontStyle,
+                                         const CFX_Matrix* pMatrix,
+                                         int dest_width,
+                                         int anti_alias,
+                                         int& text_flags) const;
+  const CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width) const;
+
+#ifdef _SKIA_SUPPORT_
+  CFX_TypeFace* GetDeviceCache() const;
+#endif
+
+ private:
+  CFX_Font* m_Font;
+};
+
 class CFX_FontFaceInfo {
  public:
   CFX_FontFaceInfo(CFX_ByteString filePath,
                    CFX_ByteString faceName,
                    CFX_ByteString fontTables,
                    uint32_t fontOffset,
                    uint32_t fileSize);
 
   const CFX_ByteString m_FilePath;
   const CFX_ByteString m_FaceName;
   const CFX_ByteString m_FontTables;
   const uint32_t m_FontOffset;
   const uint32_t m_FileSize;
   uint32_t m_Styles;
   uint32_t m_Charsets;
 };
 
-class CFX_CountedFaceCache {
- public:
-  CFX_FaceCache* m_Obj;
-  uint32_t m_nCount;
-};
-
 class CFX_GlyphBitmap {
  public:
   int m_Top;
   int m_Left;
   CFX_DIBitmap m_Bitmap;
 };
 
 struct FXTEXT_GLYPHPOS {
   const CFX_GlyphBitmap* m_pGlyph;
   int m_OriginX;
   int m_OriginY;
   FX_FLOAT m_fOriginX;
   FX_FLOAT m_fOriginY;
 };
 
 FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs,
                            int anti_alias,
                            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_