Revert of Pdfium: Fix fonts leaking on ClosePage.

core/fxge/apple/fx_apple_platform.cpp

 // 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
 
 #include "core/fxcrt/include/fx_system.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
 #ifndef _SKIA_SUPPORT_
 #include "core/fxge/agg/fx_agg_driver.h"
 #endif
 
 #include "core/fxge/apple/apple_int.h"
 #include "core/fxge/apple/cfx_quartzdevice.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/cfx_cliprgn.h"
 #include "core/fxge/ge/fx_text_int.h"
 #include "core/fxge/include/cfx_facecache.h"
+#include "core/fxge/include/cfx_fontcache.h"
 #include "core/fxge/include/cfx_gemodule.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 #include "core/fxge/include/fx_freetype.h"
 
 #ifndef _SKIA_SUPPORT_
 
 namespace {
 
 void DoNothing(void* info, const void* data, size_t size) {}
 
 FX_BOOL CGDrawGlyphRun(CGContextRef pContext,
                        int nChars,
                        const FXTEXT_CHARPOS* pCharPos,
                        CFX_Font* pFont,
+                       CFX_FontCache* pCache,
                        const CFX_Matrix* pObject2Device,
                        FX_FLOAT font_size,
                        uint32_t argb) {
   if (nChars == 0)
     return TRUE;
 
   CFX_Matrix new_matrix;
   FX_BOOL bNegSize = font_size < 0;
   if (bNegSize)
     font_size = -font_size;
@@ skipping 52 matching lines @@
           ->m_quartz2d;
   if (m_pPlatformGraphics) {
     quartz2d.destroyGraphics(m_pPlatformGraphics);
     m_pPlatformGraphics = nullptr;
   }
 }
 
 FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars,
                                             const FXTEXT_CHARPOS* pCharPos,
                                             CFX_Font* pFont,
+                                            CFX_FontCache* pCache,
                                             const CFX_Matrix* pObject2Device,
                                             FX_FLOAT font_size,
                                             uint32_t argb) {
   if (!pFont)
     return FALSE;
 
   FX_BOOL bBold = pFont->IsBold();
   if (!bBold && pFont->GetSubstFont() &&
       pFont->GetSubstFont()->m_Weight >= 500 &&
       pFont->GetSubstFont()->m_Weight <= 600) {
@@ skipping 28 matching lines @@
     }
   } else {
     rect_cg = CGRectMake(0, 0, m_pBitmap->GetWidth(), m_pBitmap->GetHeight());
   }
   rect_cg = CGContextConvertRectToDeviceSpace(ctx, rect_cg);
   if (pImageCG)
     CGContextClipToMask(ctx, rect_cg, pImageCG);
   else
     CGContextClipToRect(ctx, rect_cg);
 
-  FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pObject2Device,
-                               font_size, argb);
+  FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pCache,
+                               pObject2Device, font_size, argb);
   if (pImageCG)
     CGImageRelease(pImageCG);
   CGContextRestoreGState(ctx);
   return ret;
 }
 
 #endif  // _SKIA_SUPPORT_
 
 void CFX_FaceCache::InitPlatform() {}
 
 void CFX_FaceCache::DestroyPlatform() {}
 
 CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext(
-    const CFX_Font* pFont,
+    CFX_Font* pFont,
     uint32_t glyph_index,
     const CFX_Matrix* pMatrix,
     int dest_width,
     int anti_alias) {
   return nullptr;
 }
 
 void CFX_Font::ReleasePlatformResource() {
   if (m_pPlatformFont) {
     CQuartz2D& quartz2d =
         static_cast<CApplePlatform*>(CFX_GEModule::Get()->GetPlatformData())
             ->m_quartz2d;
     quartz2d.DestroyFont(m_pPlatformFont);
     m_pPlatformFont = nullptr;
   }
 }
 
 #endif  // _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_