Merge to XFA: Name IFX_SysFontInfo subclasses consistently.

fpdfsdk/src/fpdf_sysfontinfo.cpp

Index: fpdfsdk/src/fpdf_sysfontinfo.cpp
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp
index 18d0af06a5045add0b0bbb612a18236f1dbfe5f0..6b7d6fbe4cd25bd93a4f2601e515164dba59fc6a 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp
@@ -8,10 +8,10 @@
 #include "../include/fsdk_define.h"
 #include "../include/pdfwindow/PWL_FontMap.h"
 
-class CSysFontInfo_Ext final : public IFX_SystemFontInfo
+class CFX_ExternalFontInfo final : public IFX_SystemFontInfo
 {
 public:
-	FPDF_SYSFONTINFO*	m_pInfo;
+	CFX_ExternalFontInfo(FPDF_SYSFONTINFO* pInfo) : m_pInfo(pInfo) { }
 
 	virtual void		Release() override
 	{
@@ -78,7 +78,9 @@ public:
 	}
 
 private:
-        ~CSysFontInfo_Ext() { }
+	~CFX_ExternalFontInfo() { }
+
+	FPDF_SYSFONTINFO* const m_pInfo;
 };
 
 DLLEXPORT void STDCALL FPDF_AddInstalledFont(void* mapper, const char* name, int charset)
@@ -88,11 +90,11 @@ DLLEXPORT void STDCALL FPDF_AddInstalledFont(void* mapper, const char* name, int
 
 DLLEXPORT void STDCALL FPDF_SetSystemFontInfo(FPDF_SYSFONTINFO* pFontInfoExt)
 {
-	if (pFontInfoExt->version != 1) return;
+	if (pFontInfoExt->version != 1)
+		return;
 
-	CSysFontInfo_Ext* pFontInfo = FX_NEW CSysFontInfo_Ext;
-	pFontInfo->m_pInfo = pFontInfoExt;
-	CFX_GEModule::Get()->GetFontMgr()->SetSystemFontInfo(pFontInfo);
+	CFX_GEModule::Get()->GetFontMgr()->SetSystemFontInfo(
+		new CFX_ExternalFontInfo(pFontInfoExt));
 }
 
 DLLEXPORT const FPDF_CharsetFontMap* STDCALL FPDF_GetDefaultTTFMap()