Avoid endless loop deleting CFGAS_GEFont.

xfa/fgas/font/cfgas_gefont.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/fgas/font/cfgas_gefont.h"
 
 #include <memory>
 #include <utility>
 
 #include "core/fxge/cfx_substfont.h"
 #include "core/fxge/cfx_unicodeencoding.h"
 #include "core/fxge/cfx_unicodeencodingex.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
 #include "xfa/fxfa/xfa_fontmgr.h"
 
 // static
 CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(
     const FX_WCHAR* pszFontFamily,
     uint32_t dwFontStyles,
     uint16_t wCodePage,
     CFGAS_FontMgr* pFontMgr) {
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   if (!pFontMgr)
     return nullptr;
 
-  return CFX_RetainPtr<CFGAS_GEFont>(
-      pFontMgr->GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily));
+  return pFontMgr->GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily);
 #else
   auto pFont = pdfium::MakeRetain<CFGAS_GEFont>(pFontMgr);
   if (!pFont->LoadFontInternal(pszFontFamily, dwFontStyles, wCodePage))
     return nullptr;
   return pFont;
 #endif
 }
 
 // static
 CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(CFX_Font* pExternalFont,
@@ skipping 70 matching lines @@
     m_pFont->SetSubstFont(std::unique_ptr<CFX_SubstFont>(pSubst));
   }
   pSubst->m_Weight =
       (dwFontStyles & FX_FONTSTYLE_Bold) ? FXFONT_FW_BOLD : FXFONT_FW_NORMAL;
   if (dwFontStyles & FX_FONTSTYLE_Italic)
     pSubst->m_SubstFlags |= FXFONT_SUBST_ITALIC;
   InitFont();
 }
 
 CFGAS_GEFont::~CFGAS_GEFont() {
-  if (m_pFontMgr)
-    m_pFontMgr->RemoveFont(CFX_RetainPtr<CFGAS_GEFont>(this));
-
   if (!m_bExternalFont)
     delete m_pFont;
 }
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 bool CFGAS_GEFont::LoadFontInternal(const FX_WCHAR* pszFontFamily,
                                     uint32_t dwFontStyles,
                                     uint16_t wCodePage) {
   if (m_pFont)
     return false;
@@ skipping 287 matching lines @@
 }
 
 int32_t CFGAS_GEFont::GetAscent() const {
   return m_pFont->GetAscent();
 }
 
 int32_t CFGAS_GEFont::GetDescent() const {
   return m_pFont->GetDescent();
 }
 
-CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::GetSubstFont(
-    int32_t iGlyphIndex) const {
+CFX_RetainPtr<CFGAS_GEFont> CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) {
   iGlyphIndex = static_cast<uint32_t>(iGlyphIndex) >> 24;
   if (iGlyphIndex == 0)
-    return CFX_RetainPtr<CFGAS_GEFont>(const_cast<CFGAS_GEFont*>(this));
+    return CFX_RetainPtr<CFGAS_GEFont>(this);
   return m_SubstFonts[iGlyphIndex - 1];
 }