Pdfium: Fix fonts leaking on ClosePage.

core/fxge/ge/cfx_facecache.cpp

 // 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
 
 #include "core/fxge/include/cfx_facecache.h"
 
 #include <algorithm>
 
@@ skipping 71 matching lines @@
 #endif
 {
 }
 
 CFX_FaceCache::~CFX_FaceCache() {
 #ifdef _SKIA_SUPPORT_
   SkSafeUnref(m_pTypeface);
 #endif
 }
 
-CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont,
+CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(const CFX_Font* pFont,
                                             uint32_t glyph_index,
                                             FX_BOOL bFontStyle,
                                             const CFX_Matrix* pMatrix,
                                             int dest_width,
                                             int anti_alias) {
   if (!m_Face)
     return nullptr;
 
   FXFT_Matrix ft_matrix;
   ft_matrix.xx = (signed long)(pMatrix->GetA() / 64 * 65536);
@@ skipping 113 matching lines @@
     } else {
       ContrastAdjust(pSrcBuf, pDestBuf, bmwidth, bmheight, src_pitch,
                      dest_pitch);
       GammaAdjust(pDestBuf, bmheight, dest_pitch,
                   CFX_GEModule::Get()->GetTextGammaTable());
     }
   }
   return pGlyphBitmap;
 }
 
-const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont,
+const CFX_PathData* CFX_FaceCache::LoadGlyphPath(const CFX_Font* pFont,
                                                  uint32_t glyph_index,
                                                  int dest_width) {
   if (!m_Face || glyph_index == kInvalidGlyphIndex || dest_width < 0)
     return nullptr;
 
   uint32_t key = glyph_index;
   auto* pSubstFont = pFont->GetSubstFont();
   if (pSubstFont) {
     if (pSubstFont->m_Weight < 0 || pSubstFont->m_ItalicAngle < 0)
       return nullptr;
     uint32_t weight = static_cast<uint32_t>(pSubstFont->m_Weight);
     uint32_t angle = static_cast<uint32_t>(pSubstFont->m_ItalicAngle);
     uint32_t key_modifier = (weight / 16) << 15;
     key_modifier += (angle / 2) << 21;
     key_modifier += (static_cast<uint32_t>(dest_width) / 16) << 25;
     if (pFont->IsVertical())
       key_modifier += 1U << 31;
     key += key_modifier;
   }
   auto it = m_PathMap.find(key);
   if (it != m_PathMap.end())
     return it->second.get();
 
-  CFX_PathData* pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width);
+  CFX_PathData* pGlyphPath = pFont->LoadGlyphPathImpl(glyph_index, dest_width);
   m_PathMap[key] = std::unique_ptr<CFX_PathData>(pGlyphPath);
   return pGlyphPath;
 }
 
-const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
+const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(const CFX_Font* pFont,
                                                       uint32_t glyph_index,
                                                       FX_BOOL bFontStyle,
                                                       const CFX_Matrix* pMatrix,
                                                       int dest_width,
                                                       int anti_alias,
                                                       int& text_flags) {
   if (glyph_index == kInvalidGlyphIndex)
     return nullptr;
 
   _CFX_UniqueKeyGen keygen;
@@ skipping 76 matching lines @@
                     anti_alias);
   }
   CFX_ByteString FaceGlyphsKey2(keygen.m_Key, keygen.m_KeyLen);
   text_flags |= FXTEXT_NO_NATIVETEXT;
   return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey2, glyph_index,
                            bFontStyle, dest_width, anti_alias);
 #endif
 }
 
 #ifdef _SKIA_SUPPORT_
-CFX_TypeFace* CFX_FaceCache::GetDeviceCache(CFX_Font* pFont) {
+CFX_TypeFace* CFX_FaceCache::GetDeviceCache(const CFX_Font* pFont) {
   if (!m_pTypeface) {
     m_pTypeface =
         SkTypeface::MakeFromStream(
             new SkMemoryStream(pFont->GetFontData(), pFont->GetSize()))
             .release();
   }
   return m_pTypeface;
 }
 #endif
 
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
 void CFX_FaceCache::InitPlatform() {}
 #endif
 
 CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
-    CFX_Font* pFont,
+    const CFX_Font* pFont,
     const CFX_Matrix* pMatrix,
     const CFX_ByteString& FaceGlyphsKey,
     uint32_t glyph_index,
     FX_BOOL bFontStyle,
     int dest_width,
     int anti_alias) {
   CFX_SizeGlyphCache* pSizeCache;
   auto it = m_SizeMap.find(FaceGlyphsKey);
   if (it == m_SizeMap.end()) {
     pSizeCache = new CFX_SizeGlyphCache;
     m_SizeMap[FaceGlyphsKey] = std::unique_ptr<CFX_SizeGlyphCache>(pSizeCache);
   } else {
     pSizeCache = it->second.get();
   }
   auto it2 = pSizeCache->m_GlyphMap.find(glyph_index);
   if (it2 != pSizeCache->m_GlyphMap.end())
     return it2->second;
 
   CFX_GlyphBitmap* pGlyphBitmap = RenderGlyph(pFont, glyph_index, bFontStyle,
                                               pMatrix, dest_width, anti_alias);
   pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
   return pGlyphBitmap;
 }