Cleanup XFA-Specific memory allocators.

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 <vector>
@@ skipping 50 matching lines @@
   }
   FDE_CSSRuleData* GetClassRuleData(uint32_t dwIDHash) {
     void* pData;
     return m_ClassRules.Lookup((void*)(uintptr_t)dwIDHash, pData)
                ? (FDE_CSSRuleData*)pData
                : NULL;
   }
   FDE_CSSRuleData* GetUniversalRuleData() { return m_pUniversalRules; }
   FDE_CSSRuleData* GetPersudoRuleData() { return m_pPersudoRules; }
 
-  IFX_MEMAllocator* m_pStaticStore;
+  IFX_MemoryAllocator* m_pStaticStore;
 
  protected:
   void AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet,
                     IFDE_CSSRule* pRule,
                     uint32_t dwMediaList,
                     IFX_FontMgr* pFontMgr);
   void AddRuleTo(CFX_MapPtrToPtr& map,
                  uint32_t dwKey,
                  CFDE_CSSSelector* pSel,
                  CFDE_CSSDeclaration* pDecl);
@@ skipping 93 matching lines @@
   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);
 
   IFX_FontMgr* m_pFontMgr;
   FX_FLOAT m_fDefFontSize;
-  IFX_MEMAllocator* m_pRuleDataStore;
+  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];
-  IFX_MEMAllocator* m_pInlineStyleStore;
-  IFX_MEMAllocator* m_pFixedStyleStore;
+  IFX_MemoryAllocator* m_pInlineStyleStore;
+  IFX_MemoryAllocator* m_pFixedStyleStore;
   CFDE_CSSAccelerator* m_pAccelerator;
   std::vector<FDE_CSSRuleData*> m_MatchedRules;
 };
 
 struct FDE_CSSCOUNTERDATA {
  public:
   FDE_CSSCOUNTERDATA() { FXSYS_memset(this, 0, sizeof(FDE_CSSCOUNTERDATA)); }
   FX_BOOL GetCounterIncrement(int32_t& iValue) {
     iValue = m_iIncVal;
     return m_bIncrement;
@@ skipping 179 matching lines @@
   uint32_t m_bHasTextCombineNumber : 1;
 };
 
 class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle,
                               public IFDE_CSSBoundaryStyle,
                               public IFDE_CSSFontStyle,
                               public IFDE_CSSPositionStyle,
                               public IFDE_CSSParagraphStyle,
                               public CFX_Target {
  public:
-  CFDE_CSSComputedStyle(IFX_MEMAllocator* pAlloc)
+  CFDE_CSSComputedStyle(IFX_MemoryAllocator* pAlloc)
       : m_dwRefCount(1), m_pAllocator(pAlloc) {}
 
   ~CFDE_CSSComputedStyle() {}
 
   // IFX_Unknown:
   uint32_t AddRef() override { return ++m_dwRefCount; }
 
   uint32_t Release() override {
     uint32_t dwRefCount = --m_dwRefCount;
     if (dwRefCount == 0) {
@@ skipping 172 matching lines @@
     m_InheritedData.m_LetterSpacing = letterSpacing;
   }
 
   void AddCustomStyle(const CFX_WideString& wsName,
                       const CFX_WideString& wsValue) {
     m_CustomProperties.Add(wsName);
     m_CustomProperties.Add(wsValue);
   }
 
   uint32_t m_dwRefCount;
-  IFX_MEMAllocator* m_pAllocator;
+  IFX_MemoryAllocator* m_pAllocator;
   CFDE_CSSInheritedData m_InheritedData;
   CFDE_CSSNonInheritedData m_NonInheritedData;
   CFX_WideStringArray m_CustomProperties;
 };
 
 #endif  // XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_