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_windows.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_windows.cpp')
| -rw-r--r-- | core/src/fxcrt/fxcrt_windows.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/src/fxcrt/fxcrt_windows.cpp index 9b77b33ca2..6b0f0f290d 100644 --- a/core/src/fxcrt/fxcrt_windows.cpp +++ b/core/src/fxcrt/fxcrt_windows.cpp @@ -1,7 +1,7 @@ // 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_ext.h" @@ -23,13 +23,9 @@ FX_BOOL FX_File_Exist(FX_WSTR fileName) } return (dwAttri & FILE_ATTRIBUTE_DIRECTORY) == 0; } -IFXCRT_FileAccess* FXCRT_FileAccess_Create(IFX_Allocator* pAllocator) +IFXCRT_FileAccess* FXCRT_FileAccess_Create() { - if (pAllocator) { - return FX_NewAtAllocator(pAllocator) CFXCRT_FileAccess_Win64; - } else { - return FX_NEW CFXCRT_FileAccess_Win64; - } + return FX_NEW CFXCRT_FileAccess_Win64; } void FXCRT_Windows_GetFileMode(FX_DWORD dwMode, FX_DWORD &dwAccess, FX_DWORD &dwShare, FX_DWORD &dwCreation) { @@ -92,13 +88,9 @@ void CFXCRT_FileAccess_Win64::Close() ::CloseHandle(m_hFile); m_hFile = NULL; } -void CFXCRT_FileAccess_Win64::Release(IFX_Allocator* pAllocator) +void CFXCRT_FileAccess_Win64::Release() { - if (pAllocator) { - FX_DeleteAtAllocator(this, pAllocator, CFXCRT_FileAccess_Win64); - } else { - delete this; - } + delete this; } FX_FILESIZE CFXCRT_FileAccess_Win64::GetSize() const { |