Delete m_ExtHandle and RetainFont

core/fxge/ge/fx_ge_font.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/fxge/include/fx_font.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fxge/include/cfx_fontmgr.h"
@@ skipping 85 matching lines @@
 
 #ifdef PDF_ENABLE_XFA
 FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) {
   if (!pFont)
     return FALSE;
 
   m_bLogic = TRUE;
   if (pFont->m_pSubstFont) {
     m_pSubstFont.reset(new CFX_SubstFont);
     m_pSubstFont->m_Charset = pFont->m_pSubstFont->m_Charset;
-    m_pSubstFont->m_ExtHandle = pFont->m_pSubstFont->m_ExtHandle;
     m_pSubstFont->m_SubstFlags = pFont->m_pSubstFont->m_SubstFlags;
     m_pSubstFont->m_Weight = pFont->m_pSubstFont->m_Weight;
     m_pSubstFont->m_Family = pFont->m_pSubstFont->m_Family;
     m_pSubstFont->m_ItalicAngle = pFont->m_pSubstFont->m_ItalicAngle;
   }
   if (pFont->m_OtfFontData.GetSize()) {
     m_OtfFontData.AttachData(pFont->m_OtfFontData.GetBuffer(),
                              pFont->m_OtfFontData.GetSize());
   }
   m_Face = pFont->m_Face;
@@ skipping 49 matching lines @@
                          int weight,
                          int italic_angle,
                          int CharsetCP,
                          FX_BOOL bVertical) {
   m_bEmbedded = FALSE;
   m_bVertical = bVertical;
   m_pSubstFont.reset(new CFX_SubstFont);
   m_Face = CFX_GEModule::Get()->GetFontMgr()->FindSubstFont(
       face_name, bTrueType, flags, weight, italic_angle, CharsetCP,
       m_pSubstFont.get());
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-  if (m_pSubstFont->m_ExtHandle) {
-    m_pPlatformFont = m_pSubstFont->m_ExtHandle;
-    m_pSubstFont->m_ExtHandle = nullptr;
-  }
-#endif
   if (m_Face) {
     m_pFontData = FXFT_Get_Face_Stream_Base(m_Face);
     m_dwSize = FXFT_Get_Face_Stream_Size(m_Face);
   }
 }
 
 #ifdef PDF_ENABLE_XFA
 FX_BOOL CFX_Font::LoadFile(IFX_FileRead* pFile,
                            int nFaceIndex,
                            int* pFaceCount) {
@@ skipping 332 matching lines @@
   for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
     CFX_UnicodeEncodingEx* pFontEncoding =
         _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
     if (pFontEncoding) {
       return pFontEncoding;
     }
   }
   return nullptr;
 }
 #endif  // PDF_ENABLE_XFA