Kill IFX_FontMapper

core/src/fxge/ge/fx_ge_fontmap.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 "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 43 matching lines @@
             return FALSE;
         }
     }
     m_RefCount --;
     if (m_RefCount) {
         return FALSE;
     }
     delete this;
     return TRUE;
 }
-CFX_FontMgr::CFX_FontMgr()
+CFX_FontMgr::CFX_FontMgr() : m_FTLibrary(nullptr)
 {
-    m_pBuiltinMapper = new CFX_FontMapper;
-    m_pBuiltinMapper->m_pFontMgr = this;
-    m_pExtMapper = NULL;
-    m_FTLibrary = NULL;
+    m_pBuiltinMapper = new CFX_FontMapper(this);
     FXSYS_memset(m_ExternalFonts, 0, sizeof m_ExternalFonts);
 }
 CFX_FontMgr::~CFX_FontMgr()
 {
     delete m_pBuiltinMapper;
     FreeCache();
     if (m_FTLibrary) {
         FXFT_Done_FreeType(m_FTLibrary);
     }
 }
@@ skipping 14 matching lines @@
     }
     m_FaceMap.RemoveAll();
 }
 void CFX_FontMgr::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo)
 {
     m_pBuiltinMapper->SetSystemFontInfo(pFontInfo);
 }
 FXFT_Face CFX_FontMgr::FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType,
                                      FX_DWORD flags, int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont)
 {
-    if (m_FTLibrary == NULL) {
+    if (!m_FTLibrary) {
         FXFT_Init_FreeType(&m_FTLibrary);
     }
-    if (m_pExtMapper) {
-        FXFT_Face face = m_pExtMapper->FindSubstFont(face_name, bTrueType, flags, weight, italic_angle,
-                         CharsetCP, pSubstFont);
-        if (face) {
-            return face;
-        }
-    }
-    return m_pBuiltinMapper->FindSubstFont(face_name, bTrueType, flags, weight, italic_angle,
-                                           CharsetCP, pSubstFont);
+    return m_pBuiltinMapper->FindSubstFont(face_name, bTrueType, flags, weight, italic_angle, CharsetCP, pSubstFont);
 }
 FXFT_Face CFX_FontMgr::GetCachedFace(const CFX_ByteString& face_name,
                                      int weight, FX_BOOL bItalic, uint8_t*& pFontData)
 {
     CFX_ByteString key(face_name);
     key += ',';
     key += CFX_ByteString::FormatInteger(weight);
     key += bItalic ? 'I' : 'N';
     CTTFontDesc* pFontDesc = NULL;
     m_FaceMap.Lookup(key, (void*&)pFontDesc);
@@ skipping 321 matching lines @@
                 pFontData = g_FoxitSansMMFontData;
                 size = 66919;
             }
         } else {
             pFontData = g_FoxitFonts[index].m_pFontData;
             size = g_FoxitFonts[index].m_dwSize;
         }
     }
     return TRUE;
 }
-CFX_FontMapper::CFX_FontMapper()
+CFX_FontMapper::CFX_FontMapper(CFX_FontMgr* mgr)
+        : m_pFontInfo(nullptr),
+          m_bListLoaded(FALSE),
+          m_pFontEnumerator(nullptr),
+          m_pFontMgr(mgr)
 {
     FXSYS_memset(m_FoxitFaces, 0, sizeof m_FoxitFaces);
     m_MMFaces[0] = m_MMFaces[1] = NULL;
-    m_pFontInfo = NULL;
-    m_bListLoaded = FALSE;
-    m_pFontEnumerator = NULL;
 }
 CFX_FontMapper::~CFX_FontMapper()
 {
     for (int i = 0; i < 14; i ++)
         if (m_FoxitFaces[i]) {
             FXFT_Done_Face(m_FoxitFaces[i]);
         }
     if (m_MMFaces[0]) {
         FXFT_Done_Face(m_MMFaces[0]);
     }
@@ skipping 1038 matching lines @@
         return FALSE;
     }
     CFontFaceInfo* pFont = (CFontFaceInfo*)hFont;
     name = pFont->m_FaceName;
     return TRUE;
 }
 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset)
 {
     return FALSE;
 }