From 3522876d5291922ddc62bf1b70d02743b0850673 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 8 Jul 2014 15:30:46 -0700 Subject: Remove custom memory manager BUG= R=palmer@chromium.org Review URL: https://codereview.chromium.org/372473003 --- core/src/fxcrt/fxcrt_posix.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'core/src/fxcrt/fxcrt_posix.cpp') diff --git a/core/src/fxcrt/fxcrt_posix.cpp b/core/src/fxcrt/fxcrt_posix.cpp index 558f33466b..98f9a71c6c 100644 --- a/core/src/fxcrt/fxcrt_posix.cpp +++ b/core/src/fxcrt/fxcrt_posix.cpp @@ -7,13 +7,9 @@ #include "../../include/fxcrt/fx_ext.h" #include "fxcrt_posix.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ -IFXCRT_FileAccess* FXCRT_FileAccess_Create(IFX_Allocator* pAllocator) +IFXCRT_FileAccess* FXCRT_FileAccess_Create() { - if (pAllocator) { - return FX_NewAtAllocator(pAllocator) CFXCRT_FileAccess_Posix(); - } else { - return FX_NEW CFXCRT_FileAccess_Posix; - } + return FX_NEW CFXCRT_FileAccess_Posix; } void FXCRT_Posix_GetFileMode(FX_DWORD dwModes, FX_INT32 &nFlags, FX_INT32 &nMasks) { @@ -59,13 +55,9 @@ void CFXCRT_FileAccess_Posix::Close() close(m_nFD); m_nFD = -1; } -void CFXCRT_FileAccess_Posix::Release(IFX_Allocator* pAllocator) +void CFXCRT_FileAccess_Posix::Release() { - if (pAllocator) { - FX_DeleteAtAllocator(this, pAllocator, CFXCRT_FileAccess_Posix); - } else { - delete this; - } + delete this; } FX_FILESIZE CFXCRT_FileAccess_Posix::GetSize() const { -- cgit v1.2.3