Merge to XFA: Name IFX_SysFontInfo subclasses consistently.

fpdfsdk/src/fpdf_sysfontinfo.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 "../../public/fpdf_sysfontinfo.h"
 #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
         {
                 if (m_pInfo->Release)
                         m_pInfo->Release(m_pInfo);
                 delete this;
         }
 
         virtual FX_BOOL         EnumFontList(CFX_FontMapper* pMapper) override
         {
@@ skipping 46 matching lines @@
                 return FALSE;
         }
 
         virtual void            DeleteFont(void* hFont)  override
         {
                 if (m_pInfo->DeleteFont)
                         m_pInfo->DeleteFont(m_pInfo, hFont);
         }
 
 private:
-        ~CSysFontInfo_Ext() { }
+        ~CFX_ExternalFontInfo() { }
+
+        FPDF_SYSFONTINFO* const m_pInfo;
 };
 
 DLLEXPORT void STDCALL FPDF_AddInstalledFont(void* mapper, const char* name, int charset)
 {
         ((CFX_FontMapper*)mapper)->AddInstalledFont(name, charset);
 }
 
 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()
 {
     return CPWL_FontMap::defaultTTFMap;
 }
 
 struct FPDF_SYSFONTINFO_DEFAULT : public FPDF_SYSFONTINFO
 {
         IFX_SystemFontInfo*     m_pFontInfo;
@@ skipping 57 matching lines @@
         pFontInfoExt->GetFaceName = DefaultGetFaceName;
         pFontInfoExt->GetFont = DefaultGetFont;
         pFontInfoExt->GetFontCharset = DefaultGetFontCharset;
         pFontInfoExt->GetFontData = DefaultGetFontData;
         pFontInfoExt->MapFont = DefaultMapFont;
         pFontInfoExt->Release = DefaultRelease;
         pFontInfoExt->version = 1;
         pFontInfoExt->m_pFontInfo = pFontInfo;
         return pFontInfoExt;
 }