Remove custom memory manager

core/src/fxcrt/fx_basic_buffer.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 "../../include/fxcrt/fx_basic.h"
 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_LPSTR buf);
-CFX_BinaryBuf::CFX_BinaryBuf(IFX_Allocator* pAllocator)
-    : m_pAllocator(pAllocator)
-    , m_AllocStep(0)
+CFX_BinaryBuf::CFX_BinaryBuf()
+    : m_AllocStep(0)
     , m_pBuffer(NULL)
     , m_DataSize(0)
     , m_AllocSize(0)
 {
 }
-CFX_BinaryBuf::CFX_BinaryBuf(FX_STRSIZE size, IFX_Allocator* pAllocator)
-    : m_pAllocator(pAllocator)
-    , m_AllocStep(0)
+CFX_BinaryBuf::CFX_BinaryBuf(FX_STRSIZE size)
+    : m_AllocStep(0)
     , m_DataSize(size)
     , m_AllocSize(size)
 {
-    m_pBuffer = FX_Allocator_Alloc(m_pAllocator, FX_BYTE, size);
+    m_pBuffer = FX_Alloc(FX_BYTE, size);
 }
 CFX_BinaryBuf::~CFX_BinaryBuf()
 {
     if (m_pBuffer) {
-        FX_Allocator_Free(m_pAllocator, m_pBuffer);
+        FX_Free(m_pBuffer);
     }
 }
 void CFX_BinaryBuf::Delete(int start_index, int count)
 {
     if (!m_pBuffer || start_index < 0 || start_index + count > m_DataSize) {
         return;
     }
     FXSYS_memmove32(m_pBuffer + start_index, m_pBuffer + start_index + count, m_DataSize - start_index - count);
     m_DataSize -= count;
 }
 void CFX_BinaryBuf::Clear()
 {
     m_DataSize = 0;
 }
 void CFX_BinaryBuf::DetachBuffer()
 {
     m_DataSize = 0;
     m_pBuffer = NULL;
     m_AllocSize = 0;
 }
 void CFX_BinaryBuf::AttachData(void* buffer, FX_STRSIZE size)
 {
     if (m_pBuffer) {
-        FX_Allocator_Free(m_pAllocator, m_pBuffer);
+        FX_Free(m_pBuffer);
     }
     m_DataSize = size;
     m_pBuffer = (FX_LPBYTE)buffer;
     m_AllocSize = size;
 }
 void CFX_BinaryBuf::TakeOver(CFX_BinaryBuf& other)
 {
     AttachData(other.GetBuffer(), other.GetSize());
     other.DetachBuffer();
 }
@@ skipping 16 matching lines @@
         alloc_step = m_AllocSize / 4;
         if (alloc_step < 128 ) {
             alloc_step = 128;
         }
     } else {
         alloc_step = m_AllocStep;
     }
     new_size = (new_size + alloc_step - 1) / alloc_step * alloc_step;
     FX_LPBYTE pNewBuffer = m_pBuffer;
     if (pNewBuffer) {
-        pNewBuffer = FX_Allocator_Realloc(m_pAllocator, FX_BYTE, m_pBuffer, new_size);
+        pNewBuffer = FX_Realloc(FX_BYTE, m_pBuffer, new_size);
     } else {
-        pNewBuffer = FX_Allocator_Alloc(m_pAllocator, FX_BYTE, new_size);
+        pNewBuffer = FX_Alloc(FX_BYTE, new_size);
     }
     if (pNewBuffer) {
         m_pBuffer = pNewBuffer;
         m_AllocSize = new_size;
     }
 }
 void CFX_BinaryBuf::CopyData(const void* pStr, FX_STRSIZE size)
 {
     if (size == 0) {
         m_DataSize = 0;
@@ skipping 34 matching lines @@
     if (!m_pBuffer) {
         return;
     }
     FXSYS_memset8(m_pBuffer + m_DataSize, byte, count);
     m_DataSize += count;
 }
 CFX_ByteStringC CFX_BinaryBuf::GetByteString() const
 {
     return CFX_ByteStringC(m_pBuffer, m_DataSize);
 }
-void CFX_BinaryBuf::GetByteStringL(CFX_ByteStringL &str) const
-{
-    str.Set(CFX_ByteStringC(m_pBuffer, m_DataSize), m_pAllocator);
-}
 CFX_ByteTextBuf& CFX_ByteTextBuf::operator << (FX_BSTR lpsz)
 {
     AppendBlock((FX_LPCBYTE)lpsz, lpsz.GetLength());
     return *this;
 }
 CFX_ByteTextBuf& CFX_ByteTextBuf::operator << (int i)
 {
     char buf[32];
     FXSYS_itoa(i, buf, 10);
     AppendBlock(buf, (FX_STRSIZE)FXSYS_strlen(buf));
@@ skipping 83 matching lines @@
     return *this;
 }
 void CFX_WideTextBuf::operator =(FX_WSTR str)
 {
     CopyData(str.GetPtr(), str.GetLength() * sizeof(FX_WCHAR));
 }
 CFX_WideStringC CFX_WideTextBuf::GetWideString() const
 {
     return CFX_WideStringC((FX_LPCWSTR)m_pBuffer, m_DataSize / sizeof(FX_WCHAR));
 }
-void CFX_WideTextBuf::GetWideStringL(CFX_WideStringL& wideText) const
-{
-    wideText.Set(CFX_WideStringC((FX_LPCWSTR)m_pBuffer, m_DataSize / sizeof(FX_WCHAR)), m_pAllocator);
-}
 CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (FX_BYTE i)
 {
     if (m_pStream) {
         m_pStream->WriteBlock(&i, 1);
     } else {
         m_SavingBuf.AppendByte(i);
     }
     return *this;
 }
 CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (int i)
@@ skipping 165 matching lines @@
     while (bit_left >= 8) {
         bit_left -= 8;
         result |= m_pData[byte_pos++] << bit_left;
     }
     if (bit_left) {
         result |= m_pData[byte_pos] >> (8 - bit_left);
     }
     m_BitPos += nBits;
     return result;
 }
-IFX_BufferArchive::IFX_BufferArchive(FX_STRSIZE size, IFX_Allocator* pAllocator)
-    : m_pAllocator(pAllocator)
-    , m_BufSize(size)
+IFX_BufferArchive::IFX_BufferArchive(FX_STRSIZE size)
+    : m_BufSize(size)
     , m_pBuffer(NULL)
     , m_Length(0)
 {
 }
 void IFX_BufferArchive::Clear()
 {
     m_Length = 0;
     if (m_pBuffer) {
-        FX_Allocator_Free(m_pAllocator, m_pBuffer);
+        FX_Free(m_pBuffer);
         m_pBuffer = NULL;
     }
 }
 FX_BOOL IFX_BufferArchive::Flush()
 {
     FX_BOOL bRet = DoWork(m_pBuffer, m_Length);
     m_Length = 0;
     return bRet;
 }
 FX_INT32 IFX_BufferArchive::AppendBlock(const void* pBuf, size_t size)
 {
     if (!pBuf || size < 1) {
         return 0;
     }
     if (!m_pBuffer) {
-        m_pBuffer = FX_Allocator_Alloc(m_pAllocator, FX_BYTE, m_BufSize);
+        m_pBuffer = FX_Alloc(FX_BYTE, m_BufSize);
         if (!m_pBuffer) {
             return -1;
         }
     }
     FX_LPBYTE buffer = (FX_LPBYTE)pBuf;
     FX_STRSIZE temp_size = (FX_STRSIZE)size;
     while (temp_size > 0) {
         FX_STRSIZE buf_size = FX_MIN(m_BufSize - m_Length, (FX_STRSIZE)temp_size);
         FXSYS_memcpy32(m_pBuffer + m_Length, buffer, buf_size);
         m_Length += buf_size;
@@ skipping 14 matching lines @@
 FX_INT32 IFX_BufferArchive::AppendDWord(FX_DWORD i)
 {
     char buf[32];
     FXSYS_itoa(i, buf, 10);
     return AppendBlock(buf, (size_t)FXSYS_strlen(buf));
 }
 FX_INT32 IFX_BufferArchive::AppendString(FX_BSTR lpsz)
 {
     return AppendBlock((FX_LPCBYTE)lpsz, lpsz.GetLength());
 }
-CFX_FileBufferArchive::CFX_FileBufferArchive(FX_STRSIZE size, IFX_Allocator* pAllocator)
-    : IFX_BufferArchive(size, pAllocator)
+CFX_FileBufferArchive::CFX_FileBufferArchive(FX_STRSIZE size)
+    : IFX_BufferArchive(size)
     , m_pFile(NULL)
     , m_bTakeover(FALSE)
 {
 }
 CFX_FileBufferArchive::~CFX_FileBufferArchive()
 {
     Clear();
 }
 void CFX_FileBufferArchive::Clear()
 {
@@ skipping 49 matching lines @@
 FX_BOOL CFX_FileBufferArchive::DoWork(const void* pBuf, size_t size)
 {
     if (!m_pFile) {
         return FALSE;
     }
     if (!pBuf || size < 1) {
         return TRUE;
     }
     return m_pFile->WriteBlock(pBuf, size);
 }