Revert of Pdfium: Fix fonts leaking on ClosePage.

core/fpdfapi/fpdf_render/render_int.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_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 #define CORE_FPDFAPI_FPDF_RENDER_RENDER_INT_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_clippath.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
 #include "core/fxge/include/cfx_fxgedevice.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
 class CCodec_Jbig2Context;
 class CCodec_ScanlineDecoder;
+class CFX_FontCache;
 class CFX_GlyphBitmap;
 class CFX_ImageTransformer;
 class CFX_PathData;
 class CPDF_Color;
 class CPDF_Dictionary;
 class CPDF_Document;
 class CPDF_Font;
 class CPDF_FormObject;
 class CPDF_ImageCacheEntry;
 class CPDF_ImageLoaderHandle;
@@ skipping 29 matching lines @@
   FX_BOOL m_bIdentity;
   uint8_t m_Samples[256 * 3];
 };
 
 class CPDF_DocRenderData {
  public:
   explicit CPDF_DocRenderData(CPDF_Document* pPDFDoc);
   ~CPDF_DocRenderData();
   CPDF_Type3Cache* GetCachedType3(CPDF_Type3Font* pFont);
   CPDF_TransferFunc* GetTransferFunc(CPDF_Object* pObj);
+  CFX_FontCache* GetFontCache() { return m_pFontCache; }
   void Clear(FX_BOOL bRelease = FALSE);
   void ReleaseCachedType3(CPDF_Type3Font* pFont);
   void ReleaseTransferFunc(CPDF_Object* pObj);
 
  private:
   using CPDF_Type3CacheMap =
       std::map<CPDF_Font*, CPDF_CountedObject<CPDF_Type3Cache>*>;
   using CPDF_TransferFuncMap =
       std::map<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc>*>;
 
   CPDF_Document* m_pPDFDoc;
+  CFX_FontCache* m_pFontCache;
   CPDF_Type3CacheMap m_Type3FaceMap;
   CPDF_TransferFuncMap m_TransferFuncMap;
 };
 
 class CPDF_RenderStatus {
  public:
   CPDF_RenderStatus();
   ~CPDF_RenderStatus();
 
   FX_BOOL Initialize(class CPDF_RenderContext* pContext,
@@ skipping 493 matching lines @@
                             const uint8_t* src_buf,
                             int pixels,
                             int Bpp) const override;
 
   const uint8_t* m_RampR;
   const uint8_t* m_RampG;
   const uint8_t* m_RampB;
 };
 
 #endif  // CORE_FPDFAPI_FPDF_RENDER_RENDER_INT_H_