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/fgas/crt/fgas_memory.h | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'xfa/fgas/crt/fgas_memory.h')

diff --git a/xfa/fgas/crt/fgas_memory.h b/xfa/fgas/crt/fgas_memory.h
index ac27755cac..c6c837600b 100644
--- a/xfa/fgas/crt/fgas_memory.h
+++ b/xfa/fgas/crt/fgas_memory.h
@@ -10,39 +10,33 @@
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_system.h"
 
-class IFX_MEMAllocator;
-class CFX_Target;
 enum FX_ALLOCTYPE {
-  FX_ALLOCTYPE_Default = 0,
   FX_ALLOCTYPE_Static,
   FX_ALLOCTYPE_Fixed,
-  FX_ALLOCTYPE_Dynamic,
 };
 
-class IFX_MEMAllocator {
+class IFX_MemoryAllocator {
  public:
-  virtual ~IFX_MEMAllocator() {}
+  virtual ~IFX_MemoryAllocator() {}
   virtual void Release() = 0;
+
   virtual void* Alloc(size_t size) = 0;
   virtual void Free(void* pBlock) = 0;
-  virtual size_t GetBlockSize() const = 0;
-  virtual size_t GetDefChunkSize() const = 0;
-  virtual size_t SetDefChunkSize(size_t size) = 0;
-  virtual size_t GetCurrentDataSize() const = 0;
-};
 
-IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType,
+  static IFX_MemoryAllocator* Create(FX_ALLOCTYPE eType,
                                      size_t chunkSize,
                                      size_t blockSize);
+};
+
 class CFX_Target {
  public:
   virtual ~CFX_Target() {}
   void* operator new(size_t size) { return FX_Alloc(uint8_t, size); }
   void operator delete(void* p) { FX_Free(p); }
-  void* operator new(size_t size, IFX_MEMAllocator* pAllocator) {
+  void* operator new(size_t size, IFX_MemoryAllocator* pAllocator) {
     return pAllocator->Alloc(size);
   }
-  void operator delete(void* p, IFX_MEMAllocator* pAllocator) {
+  void operator delete(void* p, IFX_MemoryAllocator* pAllocator) {
     pAllocator->Free(p);
   }
   void* operator new(size_t size, void* place) { return place; }
-- 
cgit v1.2.3