3 files changed, 33 insertions, 33 deletions

diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h
index 7b40cd8cb1..981fcabffc 100644
--- a/xfa/fxfa/include/fxfa.h
+++ b/xfa/fxfa/include/fxfa.h
@@ -12,6 +12,7 @@
 #include "xfa/fxfa/include/fxfa_basic.h"
 #include "xfa/fxfa/include/fxfa_widget.h"
 
+class CFGAS_GEFont;
 class CFX_Graphics;
 class CPDF_Document;
 class CXFA_FFPageView;
@@ -19,7 +20,6 @@ class CXFA_Node;
 class CXFA_NodeList;
 class CXFA_WidgetAcc;
 class IFWL_AdapterTimerMgr;
-class IFGAS_Font;
 class IXFA_AppProvider;
 class IXFA_DocProvider;
 class IXFA_WidgetAccIterator;
diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h
index b4a0080425..a8bed176ab 100644
--- a/xfa/fxfa/include/fxfa_widget.h
+++ b/xfa/fxfa/include/fxfa_widget.h
@@ -17,15 +17,15 @@
 #include "xfa/fxfa/parser/cxfa_value.h"
 #include "xfa/fxfa/parser/cxfa_widgetdata.h"
 
-class CXFA_Node;
-class CXFA_FFDocView;
-class CXFA_FFDoc;
-class CXFA_FFApp;
+class CFGAS_GEFont;
 class CXFA_EventParam;
+class CXFA_FFApp;
+class CXFA_FFDoc;
+class CXFA_FFDocView;
 class CXFA_FFWidget;
+class CXFA_Node;
 class CXFA_TextLayout;
 class CXFA_WidgetLayoutData;
-class IFGAS_Font;
 class IXFA_AppProvider;
 
 class CXFA_WidgetAcc : public CXFA_WidgetData {
@@ -73,7 +73,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData {
   void UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL);
 
   CXFA_Node* GetDatasets();
-  IFGAS_Font* GetFDEFont();
+  CFGAS_GEFont* GetFDEFont();
   FX_FLOAT GetFontSize();
   FX_ARGB GetTextColor();
   FX_FLOAT GetLineHeight();
diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h
index 90418441de..121df588d2 100644
--- a/xfa/fxfa/include/xfa_fontmgr.h
+++ b/xfa/fxfa/include/xfa_fontmgr.h
@@ -30,17 +30,17 @@ class CXFA_DefFontMgr {
   CXFA_DefFontMgr() {}
   ~CXFA_DefFontMgr();
 
-  IFGAS_Font* GetFont(CXFA_FFDoc* hDoc,
-                      const CFX_WideStringC& wsFontFamily,
-                      uint32_t dwFontStyles,
-                      uint16_t wCodePage = 0xFFFF);
-  IFGAS_Font* GetDefaultFont(CXFA_FFDoc* hDoc,
-                             const CFX_WideStringC& wsFontFamily,
-                             uint32_t dwFontStyles,
-                             uint16_t wCodePage = 0xFFFF);
+  CFGAS_GEFont* GetFont(CXFA_FFDoc* hDoc,
+                        const CFX_WideStringC& wsFontFamily,
+                        uint32_t dwFontStyles,
+                        uint16_t wCodePage = 0xFFFF);
+  CFGAS_GEFont* GetDefaultFont(CXFA_FFDoc* hDoc,
+                               const CFX_WideStringC& wsFontFamily,
+                               uint32_t dwFontStyles,
+                               uint16_t wCodePage = 0xFFFF);
 
  protected:
-  CFX_ArrayTemplate<IFGAS_Font*> m_CacheFonts;
+  CFX_ArrayTemplate<CFGAS_GEFont*> m_CacheFonts;
 };
 
 class CXFA_PDFFontMgr {
@@ -48,22 +48,22 @@ class CXFA_PDFFontMgr {
   explicit CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
   ~CXFA_PDFFontMgr();
 
-  IFGAS_Font* GetFont(const CFX_WideStringC& wsFontFamily,
-                      uint32_t dwFontStyles,
-                      CPDF_Font** pPDFFont,
-                      FX_BOOL bStrictMatch = TRUE);
-  FX_BOOL GetCharWidth(IFGAS_Font* pFont,
+  CFGAS_GEFont* GetFont(const CFX_WideStringC& wsFontFamily,
+                        uint32_t dwFontStyles,
+                        CPDF_Font** pPDFFont,
+                        FX_BOOL bStrictMatch = TRUE);
+  FX_BOOL GetCharWidth(CFGAS_GEFont* pFont,
                        FX_WCHAR wUnicode,
                        int32_t& iWidth,
                        FX_BOOL bCharCode);
-  std::map<IFGAS_Font*, CPDF_Font*> m_FDE2PDFFont;
+  std::map<CFGAS_GEFont*, CPDF_Font*> m_FDE2PDFFont;
 
  protected:
-  IFGAS_Font* FindFont(CFX_ByteString strFamilyName,
-                       FX_BOOL bBold,
-                       FX_BOOL bItalic,
-                       CPDF_Font** pPDFFont,
-                       FX_BOOL bStrictMatch = TRUE);
+  CFGAS_GEFont* FindFont(CFX_ByteString strFamilyName,
+                         FX_BOOL bBold,
+                         FX_BOOL bItalic,
+                         CPDF_Font** pPDFFont,
+                         FX_BOOL bStrictMatch = TRUE);
   CFX_ByteString PsNameToFontName(const CFX_ByteString& strPsName,
                                   FX_BOOL bBold,
                                   FX_BOOL bItalic);
@@ -74,7 +74,7 @@ class CXFA_PDFFontMgr {
                                 FX_BOOL bStrictMatch = TRUE);
 
   CXFA_FFDoc* m_pDoc;
-  std::map<CFX_ByteString, IFGAS_Font*> m_FontMap;
+  std::map<CFX_ByteString, CFGAS_GEFont*> m_FontMap;
 };
 
 class CXFA_FontMgr {
@@ -82,10 +82,10 @@ class CXFA_FontMgr {
   CXFA_FontMgr();
   ~CXFA_FontMgr();
 
-  IFGAS_Font* GetFont(CXFA_FFDoc* hDoc,
-                      const CFX_WideStringC& wsFontFamily,
-                      uint32_t dwFontStyles,
-                      uint16_t wCodePage = 0xFFFF);
+  CFGAS_GEFont* GetFont(CXFA_FFDoc* hDoc,
+                        const CFX_WideStringC& wsFontFamily,
+                        uint32_t dwFontStyles,
+                        uint16_t wCodePage = 0xFFFF);
   void LoadDocFonts(CXFA_FFDoc* hDoc);
   void ReleaseDocFonts(CXFA_FFDoc* hDoc);
   void SetDefFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr);
@@ -93,7 +93,7 @@ class CXFA_FontMgr {
  protected:
   std::unique_ptr<CXFA_DefFontMgr> m_pDefFontMgr;
   std::map<CXFA_FFDoc*, std::unique_ptr<CXFA_PDFFontMgr>> m_PDFFontMgrMap;
-  std::map<CFX_ByteString, IFGAS_Font*> m_FontMap;
+  std::map<CFX_ByteString, CFGAS_GEFont*> m_FontMap;
 };
 
 #endif  //  XFA_FXFA_INCLUDE_XFA_FONTMGR_H_