From 16e587e9c34d713bb15c853e11891f0cf4d5f140 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 3 Jun 2016 16:02:17 -0700
Subject: Rename IFX_FontMgr to IFGAS_FontMgr

Avoid confusion with CFX_FontMgr, which does not inherit
from IFX_FontMgr, and lives in a different layer of code.

Do the same CFX_ -> CFGAS_ transformation for the concrete
classes that implement IFGAS_FontMgr.

Review-Url: https://codereview.chromium.org/2039463003
---
 xfa/fgas/font/fgas_font.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'xfa/fgas/font/fgas_font.h')

diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h
index 43d7d7ff96..ea82ec1526 100644
--- a/xfa/fgas/font/fgas_font.h
+++ b/xfa/fgas/font/fgas_font.h
@@ -18,7 +18,7 @@
 class CFX_FontSourceEnum_File;
 class CXFA_PDFFontMgr;
 class IFGAS_Font;
-class IFX_FontMgr;
+class IFGAS_FontMgr;
 
 #define FX_FONTSTYLE_Normal 0x00
 #define FX_FONTSTYLE_FixedPitch 0x01
@@ -55,17 +55,17 @@ class IFGAS_Font {
   static IFGAS_Font* LoadFont(const FX_WCHAR* pszFontFamily,
                               uint32_t dwFontStyles,
                               uint16_t wCodePage,
-                              IFX_FontMgr* pFontMgr);
+                              IFGAS_FontMgr* pFontMgr);
   static IFGAS_Font* LoadFont(const uint8_t* pBuffer,
                               int32_t iLength,
-                              IFX_FontMgr* pFontMgr);
+                              IFGAS_FontMgr* pFontMgr);
   static IFGAS_Font* LoadFont(const FX_WCHAR* pszFileName,
-                              IFX_FontMgr* pFontMgr);
+                              IFGAS_FontMgr* pFontMgr);
   static IFGAS_Font* LoadFont(IFX_Stream* pFontStream,
-                              IFX_FontMgr* pFontMgr,
+                              IFGAS_FontMgr* pFontMgr,
                               FX_BOOL bSaveStream = FALSE);
   static IFGAS_Font* LoadFont(CFX_Font* pExtFont,
-                              IFX_FontMgr* pFontMgr,
+                              IFGAS_FontMgr* pFontMgr,
                               FX_BOOL bTakeOver = FALSE);
   virtual ~IFGAS_Font() {}
   virtual void Release() = 0;
@@ -145,10 +145,10 @@ typedef FX_FONTDESCRIPTOR const* (*FX_LPMatchFont)(
     FX_LPFONTMATCHPARAMS pParams,
     const CFX_FontDescriptors& fonts);
 FX_LPMatchFont FX_GetDefFontMatchor();
-class IFX_FontMgr {
+class IFGAS_FontMgr {
  public:
-  static IFX_FontMgr* Create(FX_LPEnumAllFonts pEnumerator);
-  virtual ~IFX_FontMgr() {}
+  static IFGAS_FontMgr* Create(FX_LPEnumAllFonts pEnumerator);
+  virtual ~IFGAS_FontMgr() {}
   virtual void Release() = 0;
   virtual IFGAS_Font* GetDefFontByCodePage(
       uint16_t wCodePage,
@@ -185,10 +185,10 @@ class IFX_FontMgr {
 
 #else   //  _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
-class IFX_FontMgr {
+class IFGAS_FontMgr {
  public:
-  static IFX_FontMgr* Create(CFX_FontSourceEnum_File* pFontEnum);
-  virtual ~IFX_FontMgr() {}
+  static IFGAS_FontMgr* Create(CFX_FontSourceEnum_File* pFontEnum);
+  virtual ~IFGAS_FontMgr() {}
   virtual void Release() = 0;
   virtual IFGAS_Font* GetDefFontByCodePage(
       uint16_t wCodePage,
-- 
cgit v1.2.3