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

xfa/fde/css/fde_cssstyleselector.h

 // 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
 
 #ifndef XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 #define XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 
 #include <memory>
@@ skipping 21 matching lines @@
   FDE_CSSRuleData* pNext;
 };
 
 class CFDE_CSSRuleCollection : public CFX_Target {
  public:
   CFDE_CSSRuleCollection();
   ~CFDE_CSSRuleCollection() override;
 
   void AddRulesFrom(const CFDE_CSSStyleSheetArray& sheets,
                     uint32_t dwMediaList,
-                    IFGAS_FontMgr* pFontMgr);
+                    CFGAS_FontMgr* pFontMgr);
   void Clear();
 
   int32_t CountSelectors() const { return m_iSelectors; }
   FDE_CSSRuleData* GetIDRuleData(uint32_t dwIDHash) {
     void* pData;
     return m_IDRules.Lookup((void*)(uintptr_t)dwIDHash, pData)
                ? (FDE_CSSRuleData*)pData
                : nullptr;
   }
   FDE_CSSRuleData* GetTagRuleData(uint32_t dwTagHasn) {
@@ skipping 10 matching lines @@
   }
   FDE_CSSRuleData* GetUniversalRuleData() { return m_pUniversalRules; }
   FDE_CSSRuleData* GetPersudoRuleData() { return m_pPersudoRules; }
 
   IFX_MemoryAllocator* m_pStaticStore;
 
  protected:
   void AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet,
                     IFDE_CSSRule* pRule,
                     uint32_t dwMediaList,
-                    IFGAS_FontMgr* pFontMgr);
+                    CFGAS_FontMgr* pFontMgr);
   void AddRuleTo(CFX_MapPtrToPtr& map,
                  uint32_t dwKey,
                  CFDE_CSSSelector* pSel,
                  CFDE_CSSDeclaration* pDecl);
   bool AddRuleTo(FDE_CSSRuleData*& pList, FDE_CSSRuleData* pData);
   FDE_CSSRuleData* NewRuleData(CFDE_CSSSelector* pSel,
                                CFDE_CSSDeclaration* pDecl);
   CFX_MapPtrToPtr m_IDRules;
   CFX_MapPtrToPtr m_TagRules;
   CFX_MapPtrToPtr m_ClassRules;
   FDE_CSSRuleData* m_pUniversalRules;
   FDE_CSSRuleData* m_pPersudoRules;
   int32_t m_iSelectors;
 };
 
 class CFDE_CSSStyleSelector : public CFX_Target {
  public:
-  explicit CFDE_CSSStyleSelector(IFGAS_FontMgr* pFontMgr);
+  explicit CFDE_CSSStyleSelector(CFGAS_FontMgr* pFontMgr);
   ~CFDE_CSSStyleSelector() override;
 
   void SetDefFontSize(FX_FLOAT fFontSize);
 
   bool SetStyleSheet(FDE_CSSSTYLESHEETGROUP eType, IFDE_CSSStyleSheet* pSheet);
   bool SetStyleSheets(FDE_CSSSTYLESHEETGROUP eType,
                       const CFDE_CSSStyleSheetArray* pArray);
   void SetStylePriority(FDE_CSSSTYLESHEETGROUP eType,
                         FDE_CSSSTYLESHEETPRIORITY ePriority);
   void UpdateStyleIndex(uint32_t dwMediaList);
@@ skipping 63 matching lines @@
   FDE_CSSCURSOR ToCursor(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSPOSITION ToPosition(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSCAPTIONSIDE ToCaptionSide(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSBKGREPEAT ToBKGRepeat(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSBKGATTACHMENT ToBKGAttachment(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSRUBYALIGN ToRubyAlign(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSRUBYOVERHANG ToRubyOverhang(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSRUBYPOSITION ToRubyPosition(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSRUBYSPAN ToRubySpan(FDE_CSSPROPERTYVALUE eValue);
 
-  IFGAS_FontMgr* const m_pFontMgr;
+  CFGAS_FontMgr* const m_pFontMgr;
   FX_FLOAT m_fDefFontSize;
   std::unique_ptr<IFX_MemoryAllocator> m_pRuleDataStore;
   CFDE_CSSStyleSheetArray m_SheetGroups[FDE_CSSSTYLESHEETGROUP_MAX];
   CFDE_CSSRuleCollection m_RuleCollection[FDE_CSSSTYLESHEETGROUP_MAX];
   FDE_CSSSTYLESHEETGROUP m_ePriorities[FDE_CSSSTYLESHEETPRIORITY_MAX];
   std::unique_ptr<IFX_MemoryAllocator> m_pInlineStyleStore;
   std::unique_ptr<IFX_MemoryAllocator> m_pFixedStyleStore;
   std::unique_ptr<CFDE_CSSAccelerator> m_pAccelerator;
   std::vector<FDE_CSSRuleData*> m_MatchedRules;
 };
@@ skipping 225 matching lines @@
                       const CFX_WideString& wsValue);
 
   uint32_t m_dwRefCount;
   IFX_MemoryAllocator* const m_pAllocator;
   CFDE_CSSInheritedData m_InheritedData;
   CFDE_CSSNonInheritedData m_NonInheritedData;
   CFX_WideStringArray m_CustomProperties;
 };
 
 #endif  // XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_