Remove IFGAS_FontMgr and clean up (the renamed) CFGAS_FontMgr a little.

xfa/fwl/theme/cfwl_widgettp.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 "xfa/fwl/theme/cfwl_widgettp.h"
 
 #include <algorithm>
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fgas/font/fgas_gefont.h"
-#include "xfa/fgas/font/fgas_stdfontmgr.h"
+#include "xfa/fgas/font/cfgas_fontmgr.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fwl/theme/cfwl_arrowdata.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 #include "xfa/fxgraphics/cfx_shading.h"
@@ skipping 633 matching lines @@
 }
 
 bool CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
                              uint32_t dwFontStyles,
                              uint16_t dwCodePage) {
   m_wsFamily = wsFontFamily;
   m_dwStyles = dwFontStyles;
   m_dwCodePage = dwCodePage;
   if (!m_pFontMgr) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    m_pFontMgr = IFGAS_FontMgr::Create(FX_GetDefFontEnumerator());
+    m_pFontMgr = CFGAS_FontMgr::Create(FX_GetDefFontEnumerator());
 #else
     m_pFontSource.reset(new CFX_FontSourceEnum_File);
-    m_pFontMgr = IFGAS_FontMgr::Create(m_pFontSource.get());
+    m_pFontMgr = CFGAS_FontMgr::Create(m_pFontSource.get());
 #endif
   }
   m_pFont.reset(CFGAS_GEFont::LoadFont(wsFontFamily.c_str(), dwFontStyles,
                                        dwCodePage, m_pFontMgr.get()));
   return !!m_pFont;
 }
 
 CFWL_FontManager* CFWL_FontManager::s_FontManager = nullptr;
 CFWL_FontManager* CFWL_FontManager::GetInstance() {
   if (!s_FontManager)
@@ skipping 29 matching lines @@
   CFWL_FontManager::DestroyInstance();
 }
 
 uint32_t FWL_GetThemeLayout(uint32_t dwThemeID) {
   return 0xffff0000 & dwThemeID;
 }
 
 uint32_t FWL_GetThemeColor(uint32_t dwThemeID) {
   return 0x0000ffff & dwThemeID;
 }