Revert of Pdfium: Fix fonts leaking on ClosePage.

xfa/fxgraphics/cfx_graphics.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 "xfa/fxgraphics/include/cfx_graphics.h"
 
 #include <memory>
 
@@ skipping 1276 matching lines @@
   rect.Set(point.x, point.y, 0, 0);
   CalcTextInfo(text, charCodes, charPos, rect);
   CFX_Matrix m;
   m.Set(m_info.CTM.a, m_info.CTM.b, m_info.CTM.c, m_info.CTM.d, m_info.CTM.e,
         m_info.CTM.f);
   m.Translate(0, m_info.fontSize * m_info.fontHScale);
   if (matrix) {
     m.Concat(*matrix);
   }
   FX_BOOL result = m_renderDevice->DrawNormalText(
-      length, charPos, m_info.font, -m_info.fontSize * m_info.fontHScale, &m,
-      m_info.fillColor->m_info.argb, FXTEXT_CLEARTYPE);
+      length, charPos, m_info.font, CFX_GEModule::Get()->GetFontCache(),
+      -m_info.fontSize * m_info.fontHScale, &m, m_info.fillColor->m_info.argb,
+      FXTEXT_CLEARTYPE);
   if (!result)
     return FWL_Error::Indefinite;
   FX_Free(charPos);
   FX_Free(charCodes);
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFX_Graphics::StrokePathWithPattern(CFX_Path* path,
                                               CFX_Matrix* matrix) {
   return FWL_Error::MethodNotSupported;
@@ skipping 261 matching lines @@
   CTM = other.CTM;
   isActOnDash = other.isActOnDash;
   strokeColor = other.strokeColor;
   fillColor = other.fillColor;
   font = other.font;
   fontSize = other.fontSize;
   fontHScale = other.fontHScale;
   fontSpacing = other.fontSpacing;
   return *this;
 }