Revert of Pdfium: Fix fonts leaking on ClosePage.

core/fxge/include/cfx_renderdevice.h

 // Copyright 2016 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_CFX_RENDERDEVICE_H_
 #define CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_
 
 #include <memory>
 
 #include "core/fxge/include/cfx_gemodule.h"
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_font.h"
 
 class CFX_Font;
+class CFX_FontCache;
 class CFX_GraphStateData;
 class IFX_RenderDeviceDriver;
 
 #define FXDC_DEVICE_CLASS 1
 #define FXDC_PIXEL_WIDTH 2
 #define FXDC_PIXEL_HEIGHT 3
 #define FXDC_BITS_PIXEL 4
 #define FXDC_HORZ_SIZE 5
 #define FXDC_VERT_SIZE 6
 #define FXDC_RENDER_CAPS 7
@@ skipping 173 matching lines @@
                                const CFX_Matrix* pMatrix,
                                uint32_t flags,
                                void*& handle,
                                int blend_type);
   FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause);
   void CancelDIBits(void* handle);
 
   FX_BOOL DrawNormalText(int nChars,
                          const FXTEXT_CHARPOS* pCharPos,
                          CFX_Font* pFont,
+                         CFX_FontCache* pCache,
                          FX_FLOAT font_size,
                          const CFX_Matrix* pText2Device,
                          uint32_t fill_color,
                          uint32_t text_flags);
   FX_BOOL DrawTextPath(int nChars,
                                 const FXTEXT_CHARPOS* pCharPos,
                                 CFX_Font* pFont,
+                                CFX_FontCache* pCache,
                                 FX_FLOAT font_size,
                                 const CFX_Matrix* pText2User,
                                 const CFX_Matrix* pUser2Device,
                                 const CFX_GraphStateData* pGraphState,
                                 uint32_t fill_color,
                                 uint32_t stroke_color,
                                 CFX_PathData* pClippingPath,
                                 int nFlag);
 
 #ifdef _SKIA_SUPPORT_
@@ skipping 22 matching lines @@
   int m_Width;
   int m_Height;
   int m_bpp;
   int m_RenderCaps;
   int m_DeviceClass;
   FX_RECT m_ClipBox;
   std::unique_ptr<IFX_RenderDeviceDriver> m_pDeviceDriver;
 };
 
 #endif  // CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_