Merge to XFA: Add CFX_FontFaceInfo constructor.

core/src/fxge/ge/fx_ge_fontmap.cpp

Index: core/src/fxge/ge/fx_ge_fontmap.cpp
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index 2e591cd986ac05f74601ab14e41bcf118b30d3f6..eefeb5d618a07e2c70b6ec4b4da3dc75bb9545c3 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -467,12 +467,13 @@ FX_BOOL CFX_FontMgr::GetStandardFont(const uint8_t*& pFontData,
   return TRUE;
 }
 CFX_FontMapper::CFX_FontMapper(CFX_FontMgr* mgr)
-    : m_pFontInfo(nullptr),
-      m_bListLoaded(FALSE),
+    : m_bListLoaded(FALSE),
+      m_pFontInfo(nullptr),
       m_pFontEnumerator(nullptr),
       m_pFontMgr(mgr) {
-  FXSYS_memset(m_FoxitFaces, 0, sizeof m_FoxitFaces);
-  m_MMFaces[0] = m_MMFaces[1] = NULL;
+  m_MMFaces[0] = nullptr;
+  m_MMFaces[1] = nullptr;
+  FXSYS_memset(m_FoxitFaces, 0, sizeof(m_FoxitFaces));
 }
 CFX_FontMapper::~CFX_FontMapper() {
   for (int i = 0; i < 14; i++)
@@ -1379,7 +1380,7 @@ CFX_FolderFontInfo::~CFX_FolderFontInfo() {
     CFX_ByteString key;
     void* value;
     m_FontList.GetNextAssoc(pos, key, value);
-    delete (CFontFaceInfo*)value;
+    delete (CFX_FontFaceInfo*)value;
   }
 }
 void CFX_FolderFontInfo::AddPath(const CFX_ByteStringC& path) {
@@ -1493,16 +1494,8 @@ void CFX_FolderFontInfo::ReportFace(CFX_ByteString& path,
   if (m_FontList.Lookup(facename, p)) {
     return;
   }
-  CFontFaceInfo* pInfo = new CFontFaceInfo;
-  if (!pInfo) {
-    return;
-  }
-  pInfo->m_FilePath = path;
-  pInfo->m_FaceName = facename;
-  pInfo->m_FontTables = tables;
-  pInfo->m_FontOffset = offset;
-  pInfo->m_FileSize = filesize;
-  pInfo->m_Charsets = 0;
+  CFX_FontFaceInfo* pInfo =
+      new CFX_FontFaceInfo(path, facename, tables, offset, filesize);
   CFX_ByteString os2 =
       _FPDF_LoadTableFromTT(pFile, tables, nTables, 0x4f532f32);
   if (os2.GetLength() >= 86) {
@@ -1572,7 +1565,7 @@ FX_DWORD CFX_FolderFontInfo::GetFontData(void* hFont,
   if (hFont == NULL) {
     return 0;
   }
-  CFontFaceInfo* pFont = (CFontFaceInfo*)hFont;
+  CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
   FXSYS_FILE* pFile = NULL;
   if (size > 0) {
     pFile = FXSYS_fopen(pFont->m_FilePath, "rb");
@@ -1612,7 +1605,7 @@ FX_BOOL CFX_FolderFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) {
   if (hFont == NULL) {
     return FALSE;
   }
-  CFontFaceInfo* pFont = (CFontFaceInfo*)hFont;
+  CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
   name = pFont->m_FaceName;
   return TRUE;
 }