Remove dead code in CFGAS_FontMgrImp.

xfa/fgas/font/fgas_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/fgas_gefont.h"
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
 #include "xfa/fxfa/include/xfa_fontmgr.h"
 
 // static
 CFGAS_GEFont* CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFontFamily,
                                      uint32_t dwFontStyles,
                                      uint16_t wCodePage,
                                      IFGAS_FontMgr* pFontMgr) {
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   if (NULL != pFontMgr) {
     return pFontMgr->GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily);
   }
   return NULL;
 #else
   CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr);
-  if (!pFont->LoadFont(pszFontFamily, dwFontStyles, wCodePage)) {
+  if (!pFont->LoadFontInternal(pszFontFamily, dwFontStyles, wCodePage)) {
     pFont->Release();
     return NULL;
   }
   return pFont;
 #endif
 }
 
 // static
 CFGAS_GEFont* CFGAS_GEFont::LoadFont(CFX_Font* pExtFont,
-                                     IFGAS_FontMgr* pFontMgr,
-                                     FX_BOOL bTakeOver) {
+                                     IFGAS_FontMgr* pFontMgr) {
   CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr);
-  if (!pFont->LoadFont(pExtFont, bTakeOver)) {
+  if (!pFont->LoadFontInternal(pExtFont)) {
     pFont->Release();
     return NULL;
   }
   return pFont;
 }
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 // static
 CFGAS_GEFont* CFGAS_GEFont::LoadFont(const uint8_t* pBuffer,
                                      int32_t iLength,
                                      IFGAS_FontMgr* pFontMgr) {
   CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr);
-  if (!pFont->LoadFont(pBuffer, iLength)) {
+  if (!pFont->LoadFontInternal(pBuffer, iLength)) {
     pFont->Release();
     return nullptr;
   }
-  return pFont;
-}
-
-// static
-CFGAS_GEFont* CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFileName) {
-  CFGAS_GEFont* pFont = new CFGAS_GEFont(nullptr);
-  if (!pFont->LoadFontInternal(pszFileName)) {
-    pFont->Release();
-    return nullptr;
-  }
   return pFont;
 }
 
 // static
 CFGAS_GEFont* CFGAS_GEFont::LoadFont(IFX_Stream* pFontStream,
                                      IFGAS_FontMgr* pFontMgr,
                                      FX_BOOL bSaveStream) {
   CFGAS_GEFont* pFont = new CFGAS_GEFont(pFontMgr);
-  if (!pFont->LoadFont(pFontStream, bSaveStream)) {
+  if (!pFont->LoadFontInternal(pFontStream, bSaveStream)) {
     pFont->Release();
     return nullptr;
   }
   return pFont;
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 CFGAS_GEFont::CFGAS_GEFont(IFGAS_FontMgr* pFontMgr)
     :
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
@@ skipping 75 matching lines @@
     }
     delete this;
   }
 }
 CFGAS_GEFont* CFGAS_GEFont::Retain() {
   ++m_iRefCount;
   return this;
 }
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-FX_BOOL CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFontFamily,
-                               uint32_t dwFontStyles,
-                               uint16_t wCodePage) {
+FX_BOOL CFGAS_GEFont::LoadFontInternal(const FX_WCHAR* pszFontFamily,
+                                       uint32_t dwFontStyles,
+                                       uint16_t wCodePage) {
   if (m_pFont) {
     return FALSE;
   }
   CFX_ByteString csFontFamily;
   if (pszFontFamily != NULL) {
     csFontFamily = CFX_ByteString::FromUnicode(pszFontFamily);
   }
   uint32_t dwFlags = 0;
   if (dwFontStyles & FX_FONTSTYLE_FixedPitch) {
     dwFlags |= FXFONT_FIXED_PITCH;
@@ skipping 32 matching lines @@
     csFontFamily += ",Italic";
   }
   m_pFont->LoadSubst(csFontFamily, TRUE, dwFlags, iWeight, 0, wCodePage);
   FX_BOOL bRet = m_pFont->GetFace() != nullptr;
   if (bRet) {
     bRet = InitFont();
   }
   return bRet;
 }
 
-FX_BOOL CFGAS_GEFont::LoadFont(const uint8_t* pBuffer, int32_t length) {
+FX_BOOL CFGAS_GEFont::LoadFontInternal(const uint8_t* pBuffer, int32_t length) {
   if (m_pFont) {
     return FALSE;
   }
   m_pFont = new CFX_Font;
   FX_BOOL bRet = m_pFont->LoadEmbedded(pBuffer, length);
   if (bRet) {
     bRet = InitFont();
   }
   m_wCharSet = 0xFFFF;
   return bRet;
 }
 
-FX_BOOL CFGAS_GEFont::LoadFontInternal(const FX_WCHAR* pszFileName) {
-  if (m_pFont || m_pStream || m_pFileRead) {
-    return FALSE;
-  }
-  m_pStream = IFX_Stream::CreateStream(
-      pszFileName, FX_STREAMACCESS_Binary | FX_STREAMACCESS_Read);
-  m_pFileRead = FX_CreateFileRead(m_pStream);
-  FX_BOOL bRet = FALSE;
-  if (m_pStream && m_pFileRead) {
-    m_pFont = new CFX_Font;
-    bRet = m_pFont->LoadFile(m_pFileRead);
-    if (bRet) {
-      bRet = InitFont();
-    } else {
-      m_pFileRead->Release();
-      m_pFileRead = nullptr;
-    }
-  }
-  m_wCharSet = 0xFFFF;
-  return bRet;
-}
-
-FX_BOOL CFGAS_GEFont::LoadFont(IFX_Stream* pFontStream, FX_BOOL bSaveStream) {
+FX_BOOL CFGAS_GEFont::LoadFontInternal(IFX_Stream* pFontStream,
+                                       FX_BOOL bSaveStream) {
   if (m_pFont || m_pFileRead || !pFontStream || pFontStream->GetLength() < 1) {
     return FALSE;
   }
   if (bSaveStream) {
     m_pStream = pFontStream;
   }
   m_pFileRead = FX_CreateFileRead(pFontStream);
   m_pFont = new CFX_Font;
   FX_BOOL bRet = m_pFont->LoadFile(m_pFileRead);
   if (bRet) {
     bRet = InitFont();
   } else {
     m_pFileRead->Release();
     m_pFileRead = nullptr;
   }
   m_wCharSet = 0xFFFF;
   return bRet;
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
-FX_BOOL CFGAS_GEFont::LoadFont(CFX_Font* pExtFont, FX_BOOL bTakeOver) {
+FX_BOOL CFGAS_GEFont::LoadFontInternal(CFX_Font* pExtFont) {
   if (m_pFont || !pExtFont) {
     return FALSE;
   }
   m_pFont = pExtFont;
-  FX_BOOL bRet = !!m_pFont;
-  if (bRet) {
-    m_bExtFont = !bTakeOver;
-    bRet = InitFont();
-  } else {
-    m_bExtFont = TRUE;
-  }
+  m_bExtFont = TRUE;
   m_wCharSet = 0xFFFF;
-  return bRet;
+  return InitFont();
 }
 
 FX_BOOL CFGAS_GEFont::InitFont() {
   if (!m_pFont)
     return FALSE;
   if (!m_pFontEncoding) {
     m_pFontEncoding = FX_CreateFontEncodingEx(m_pFont);
     if (!m_pFontEncoding)
       return FALSE;
   }
@@ skipping 230 matching lines @@
   }
   if (m_pRectArray != NULL) {
     m_pRectArray->RemoveAll();
   }
 }
 CFGAS_GEFont* CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
   iGlyphIndex = ((uint32_t)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? const_cast<CFGAS_GEFont*>(this)
                           : m_SubstFonts[iGlyphIndex - 1];
 }