From 4d06f83da7fbc65e83ecc3c36b339c04ac1ab668 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Tue, 3 May 2016 14:13:29 -0700
Subject: Cleanup XFA-Specific memory allocators.

Remove unused "dynamic" allocator (the scary one).
Use malloc/free wrapper allocator under #ifdef for CF/asan testing.
Rename IFX_MEMAllocator to IFX_MemoryAllocator (MEM in all caps
would imply that MEM was an acroynm, not an abbreviation).

Review-Url: https://codereview.chromium.org/1944093002
---
 xfa/fde/css/fde_cssdeclaration.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'xfa/fde/css/fde_cssdeclaration.h')

diff --git a/xfa/fde/css/fde_cssdeclaration.h b/xfa/fde/css/fde_cssdeclaration.h
index d9bacd0e4f..4fa6858f97 100644
--- a/xfa/fde/css/fde_cssdeclaration.h
+++ b/xfa/fde/css/fde_cssdeclaration.h
@@ -25,7 +25,7 @@ class FDE_CSSCustomProperty : public CFX_Target {
 };
 
 struct FDE_CSSPROPERTYARGS {
-  IFX_MEMAllocator* pStaticStore;
+  IFX_MemoryAllocator* pStaticStore;
   CFX_MapPtrToPtr* pStringCache;
   FDE_LPCCSSPROPERTYTABLE pProperty;
 };
@@ -87,13 +87,13 @@ class CFDE_CSSDeclaration : public CFX_Target {
                                  const FX_WCHAR* pszValue,
                                  int32_t iValueLen,
                                  FX_BOOL bImportant);
-  FX_BOOL ParseBorderPropoerty(IFX_MEMAllocator* pStaticStore,
+  FX_BOOL ParseBorderPropoerty(IFX_MemoryAllocator* pStaticStore,
                                const FX_WCHAR* pszValue,
                                int32_t iValueLen,
                                IFDE_CSSValue*& pColor,
                                IFDE_CSSValue*& pStyle,
                                IFDE_CSSValue*& pWidth) const;
-  void AddBorderProperty(IFX_MEMAllocator* pStaticStore,
+  void AddBorderProperty(IFX_MemoryAllocator* pStaticStore,
                          IFDE_CSSValue* pColor,
                          IFDE_CSSValue* pStyle,
                          IFDE_CSSValue* pWidth,
@@ -113,7 +113,7 @@ class CFDE_CSSDeclaration : public CFX_Target {
                                  const FX_WCHAR* pszValue,
                                  int32_t iValueLen,
                                  FX_BOOL bImportant);
-  FX_BOOL Add4ValuesProperty(IFX_MEMAllocator* pStaticStore,
+  FX_BOOL Add4ValuesProperty(IFX_MemoryAllocator* pStaticStore,
                              const CFDE_CSSValueArray& list,
                              FX_BOOL bImportant,
                              FDE_CSSPROPERTY eLeft,
@@ -141,14 +141,14 @@ class CFDE_CSSDeclaration : public CFX_Target {
   const FX_WCHAR* CopyToLocal(const FDE_CSSPROPERTYARGS* pArgs,
                               const FX_WCHAR* pszValue,
                               int32_t iValueLen);
-  void AddPropertyHolder(IFX_MEMAllocator* pStaticStore,
+  void AddPropertyHolder(IFX_MemoryAllocator* pStaticStore,
                          FDE_CSSPROPERTY eProperty,
                          IFDE_CSSValue* pValue,
                          FX_BOOL bImportant);
-  IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MEMAllocator* pStaticStore,
+  IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MemoryAllocator* pStaticStore,
                                          FDE_CSSPRIMITIVETYPE eUnit,
                                          FX_FLOAT fValue) const;
-  IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MEMAllocator* pStaticStore,
+  IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MemoryAllocator* pStaticStore,
                                        FDE_CSSPROPERTYVALUE eValue) const;
 
   FDE_CSSPropertyHolder* m_pFirstProperty;
-- 
cgit v1.2.3