Delete m_ExtHandle and RetainFont

core/fxge/ge/fx_ge_text.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 <limits>
 #include <vector>
 
 #include "core/fxcodec/include/fx_codec.h"
@@ skipping 95 matching lines @@
   return rect;
 }
 
 CFX_FontCache::CFX_FontCache() {}
 
 CFX_FontCache::~CFX_FontCache() {
   FreeCache(TRUE);
 }
 
 CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) {
-  FXFT_Face internal_face = pFont->GetFace();
-  const bool bExternal = !internal_face;
-  FXFT_Face face =
-      bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face;
+  FXFT_Face face = pFont->GetFace();
+  const bool bExternal = !face;
   CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap;
   auto it = map.find(face);
   if (it != map.end()) {
     CFX_CountedFaceCache* counted_face_cache = it->second;
     counted_face_cache->m_nCount++;
     return counted_face_cache->m_Obj;
   }
 
   CFX_FaceCache* face_cache = new CFX_FaceCache(bExternal ? nullptr : face);
   CFX_CountedFaceCache* counted_face_cache = new CFX_CountedFaceCache;
@@ skipping 13 matching lines @@
     m_pTypeface =
         SkTypeface::MakeFromStream(
             new SkMemoryStream(pFont->GetFontData(), pFont->GetSize()))
             .release();
   }
   return m_pTypeface;
 }
 #endif
 
 void CFX_FontCache::ReleaseCachedFace(CFX_Font* pFont) {
-  FXFT_Face internal_face = pFont->GetFace();
-  const bool bExternal = !internal_face;
-  FXFT_Face face =
-      bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face;
+  FXFT_Face face = pFont->GetFace();
+  const bool bExternal = !face;
   CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap;
 
   auto it = map.find(face);
   if (it == map.end())
     return;
 
   CFX_CountedFaceCache* counted_face_cache = it->second;
   if (counted_face_cache->m_nCount > 1) {
     counted_face_cache->m_nCount--;
   }
@@ skipping 673 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((uint32_t*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(uint32_t);
 }