Revert of Pdfium: Fix fonts leaking on ClosePage.

core/fxge/agg/fx_agg_driver.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_AGG_FX_AGG_DRIVER_H_
 #define CORE_FXGE_AGG_FX_AGG_DRIVER_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxge/include/ifx_renderdevicedriver.h"
 #include "third_party/agg23/agg_clip_liang_barsky.h"
 #include "third_party/agg23/agg_path_storage.h"
 #include "third_party/agg23/agg_rasterizer_scanline_aa.h"
 
 class CFX_ClipRgn;
+class CFX_FontCache;
 class CFX_GraphStateData;
 class CFX_Matrix;
 class CFX_PathData;
 
 class CAgg_PathData {
  public:
   CAgg_PathData() {}
   ~CAgg_PathData() {}
   void BuildPath(const CFX_PathData* pPathData,
                  const CFX_Matrix* pObject2Device);
@@ skipping 56 matching lines @@
                       uint32_t color,
                       const CFX_Matrix* pMatrix,
                       uint32_t flags,
                       void*& handle,
                       int blend_type) override;
   FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override;
   void CancelDIBits(void* handle) override;
   FX_BOOL DrawDeviceText(int nChars,
                          const FXTEXT_CHARPOS* pCharPos,
                          CFX_Font* pFont,
+                         CFX_FontCache* pCache,
                          const CFX_Matrix* pObject2Device,
                          FX_FLOAT font_size,
                          uint32_t color) override;
   int GetDriverType() const override;
 
   FX_BOOL RenderRasterizer(agg::rasterizer_scanline_aa& rasterizer,
                            uint32_t color,
                            FX_BOOL bFullCover,
                            FX_BOOL bGroupKnockout,
                            int alpha_flag,
@@ skipping 11 matching lines @@
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   void* m_pPlatformGraphics;
 #endif
   int m_FillFlags;
   FX_BOOL m_bRgbByteOrder;
   CFX_DIBitmap* m_pOriDevice;
   FX_BOOL m_bGroupKnockout;
 };
 
 #endif  // CORE_FXGE_AGG_FX_AGG_DRIVER_H_