From b71dc76df4a1eb04f89a64cd542a1d585df3251e Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 3 Jun 2016 14:04:19 -0700
Subject: Rename IFX_Font to IFGAS_Font

Avoid confusion with CFX_Font, which is defined in fxcrt,
and does not inherit from nor bear any resemblence to IFX_Font.

Review-Url: https://codereview.chromium.org/2036173003
---
 xfa/fwl/basewidget/fwl_barcodeimp.cpp |  2 +-
 xfa/fwl/basewidget/fwl_editimp.cpp    |  4 ++--
 xfa/fwl/theme/cfwl_widgettp.cpp       | 14 +++++++-------
 xfa/fwl/theme/cfwl_widgettp.h         | 18 +++++++++---------
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'xfa/fwl')

diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.cpp b/xfa/fwl/basewidget/fwl_barcodeimp.cpp
index 97ade357d3..f780a22002 100644
--- a/xfa/fwl/basewidget/fwl_barcodeimp.cpp
+++ b/xfa/fwl/basewidget/fwl_barcodeimp.cpp
@@ -111,7 +111,7 @@ void CFWL_BarcodeImp::GenerateBarcodeImageCache() {
   CFWL_ThemePart part;
   part.m_pWidget = m_pInterface;
   IFWL_ThemeProvider* pTheme = GetAvailableTheme();
-  IFX_Font* pFont = static_cast<IFX_Font*>(
+  IFGAS_Font* pFont = static_cast<IFGAS_Font*>(
       pTheme->GetCapacity(&part, CFWL_WidgetCapacity::Font));
   CFX_Font* pCXFont =
       pFont ? static_cast<CFX_Font*>(pFont->GetDevFont()) : nullptr;
diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp
index 6d0197eeb4..e1b82a07c6 100644
--- a/xfa/fwl/basewidget/fwl_editimp.cpp
+++ b/xfa/fwl/basewidget/fwl_editimp.cpp
@@ -1194,8 +1194,8 @@ void CFWL_EditImp::UpdateEditParams() {
   if (!pLineHeight)
     return;
   params.fLineSpace = *pLineHeight;
-  IFX_Font* pFont =
-      static_cast<IFX_Font*>(GetThemeCapacity(CFWL_WidgetCapacity::Font));
+  IFGAS_Font* pFont =
+      static_cast<IFGAS_Font*>(GetThemeCapacity(CFWL_WidgetCapacity::Font));
   if (!pFont)
     return;
   params.pFont = pFont;
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index 828a16ade6..df0cedbab5 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -201,7 +201,7 @@ FWL_Error CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget,
   return FWL_Error::Succeeded;
 }
 FWL_Error CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget,
-                                 IFX_Font* pFont,
+                                 IFGAS_Font* pFont,
                                  FX_FLOAT fFontSize,
                                  FX_ARGB rgbFont) {
   if (!m_pTextOut)
@@ -212,7 +212,7 @@ FWL_Error CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget,
   m_pTextOut->SetTextColor(rgbFont);
   return FWL_Error::Succeeded;
 }
-IFX_Font* CFWL_WidgetTP::GetFont(IFWL_Widget* pWidget) {
+IFGAS_Font* CFWL_WidgetTP::GetFont(IFWL_Widget* pWidget) {
   return m_pFDEFont;
 }
 
@@ -711,8 +711,8 @@ FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
     m_pFontMgr = IFX_FontMgr::Create(m_pFontSource);
 #endif
   }
-  m_pFont = IFX_Font::LoadFont(wsFontFamily.c_str(), dwFontStyles, dwCodePage,
-                               m_pFontMgr);
+  m_pFont = IFGAS_Font::LoadFont(wsFontFamily.c_str(), dwFontStyles, dwCodePage,
+                                 m_pFontMgr);
   return m_pFont != NULL;
 }
 
@@ -728,9 +728,9 @@ void CFWL_FontManager::DestroyInstance() {
 }
 CFWL_FontManager::CFWL_FontManager() {}
 CFWL_FontManager::~CFWL_FontManager() {}
-IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily,
-                                     uint32_t dwFontStyles,
-                                     uint16_t wCodePage) {
+IFGAS_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily,
+                                       uint32_t dwFontStyles,
+                                       uint16_t wCodePage) {
   for (const auto& pData : m_FontsArray) {
     if (pData->Equal(wsFontFamily, dwFontStyles, wCodePage))
       return pData->GetFont();
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index b66e19344e..296d65f1af 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -93,7 +93,7 @@ enum class CFWL_WidgetCapacity {
 
 class IFWL_Widget;
 class CFDE_TextOut;
-class IFX_Font;
+class IFGAS_Font;
 class IFX_FontMgr;
 class CFWL_ArrowData;
 class CFWL_ThemeBackground;
@@ -135,10 +135,10 @@ class CFWL_WidgetTP {
                     FX_FLOAT fFontSize,
                     FX_ARGB rgbFont);
   FWL_Error SetFont(IFWL_Widget* pWidget,
-                    IFX_Font* pFont,
+                    IFGAS_Font* pFont,
                     FX_FLOAT fFontSize,
                     FX_ARGB rgbFont);
-  IFX_Font* GetFont(IFWL_Widget* pWidget);
+  IFGAS_Font* GetFont(IFWL_Widget* pWidget);
 
  protected:
   CFWL_WidgetTP();
@@ -221,7 +221,7 @@ class CFWL_WidgetTP {
                     CFX_Matrix* pMatrix = NULL);
   uint32_t m_dwRefCount;
   std::unique_ptr<CFDE_TextOut> m_pTextOut;
-  IFX_Font* m_pFDEFont;
+  IFGAS_Font* m_pFDEFont;
   FX_FLOAT m_fValue;
   uint32_t m_dwValue;
   CFX_RectF m_rtMargin;
@@ -264,13 +264,13 @@ class CFWL_FontData {
   FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily,
                    uint32_t dwFontStyles,
                    uint16_t wCodePage);
-  IFX_Font* GetFont() const { return m_pFont; }
+  IFGAS_Font* GetFont() const { return m_pFont; }
 
  protected:
   CFX_WideString m_wsFamily;
   uint32_t m_dwStyles;
   uint32_t m_dwCodePage;
-  IFX_Font* m_pFont;
+  IFGAS_Font* m_pFont;
   IFX_FontMgr* m_pFontMgr;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   CFX_FontSourceEnum_File* m_pFontSource;
@@ -282,9 +282,9 @@ class CFWL_FontManager {
   static CFWL_FontManager* GetInstance();
   static void DestroyInstance();
 
-  IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily,
-                     uint32_t dwFontStyles,
-                     uint16_t dwCodePage);
+  IFGAS_Font* FindFont(const CFX_WideStringC& wsFontFamily,
+                       uint32_t dwFontStyles,
+                       uint16_t dwCodePage);
 
  protected:
   CFWL_FontManager();
-- 
cgit v1.2.3