diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-07-08 15:30:46 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-07-08 15:30:46 -0700 |
| commit | 3522876d5291922ddc62bf1b70d02743b0850673 (patch) | |
| tree | b3fd7eda6e8ed8f07674f6a6fba21e82ca83bee7 /core/src/fxcrt/fxcrt_platforms.cpp | |
| parent | e7ee98e4c6fd56c9e930194e9fc11cc10e8293a1 (diff) | |
| download | pdfium-3522876d5291922ddc62bf1b70d02743b0850673.tar.xz | |
Remove custom memory manager
BUG=
R=palmer@chromium.org
Review URL: https://codereview.chromium.org/372473003
Diffstat (limited to 'core/src/fxcrt/fxcrt_platforms.cpp')
| -rw-r--r-- | core/src/fxcrt/fxcrt_platforms.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/core/src/fxcrt/fxcrt_platforms.cpp b/core/src/fxcrt/fxcrt_platforms.cpp index 7fb3adae40..e14e362079 100644 --- a/core/src/fxcrt/fxcrt_platforms.cpp +++ b/core/src/fxcrt/fxcrt_platforms.cpp @@ -7,13 +7,9 @@ #include "../../include/fxcrt/fx_ext.h" #include "fxcrt_platforms.h" #if (_FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ && _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_CRT; - } else { - return FX_NEW CFXCRT_FileAccess_CRT; - } + return FX_NEW CFXCRT_FileAccess_CRT; } void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode) { @@ -71,13 +67,9 @@ void CFXCRT_FileAccess_CRT::Close() FXSYS_fclose(m_hFile); m_hFile = NULL; } -void CFXCRT_FileAccess_CRT::Release(IFX_Allocator* pAllocator) +void CFXCRT_FileAccess_CRT::Release() { - if (pAllocator) { - FX_DeleteAtAllocator(this, pAllocator, CFXCRT_FileAccess_CRT); - } else { - delete this; - } + delete this; } FX_FILESIZE CFXCRT_FileAccess_CRT::GetSize() const { |