| OLD | NEW |
| 1 // Copyright 2014 PDFium Authors. All rights reserved. | 1 // Copyright 2014 PDFium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
| 6 | 6 |
| 7 #ifndef XFA_SRC_FGAS_INCLUDE_FX_MEM_H_ | 7 #ifndef XFA_SRC_FGAS_INCLUDE_FX_MEM_H_ |
| 8 #define XFA_SRC_FGAS_INCLUDE_FX_MEM_H_ | 8 #define XFA_SRC_FGAS_INCLUDE_FX_MEM_H_ |
| 9 | 9 |
| 10 #include "core/include/fxcrt/fx_memory.h" // For FX_Alloc(). | 10 #include "core/include/fxcrt/fx_memory.h" // For FX_Alloc(). |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 void operator delete(void* p) { FX_Free(p); } | 40 void operator delete(void* p) { FX_Free(p); } |
| 41 void* operator new(size_t size, IFX_MEMAllocator* pAllocator) { | 41 void* operator new(size_t size, IFX_MEMAllocator* pAllocator) { |
| 42 return pAllocator->Alloc(size); | 42 return pAllocator->Alloc(size); |
| 43 } | 43 } |
| 44 void operator delete(void* p, IFX_MEMAllocator* pAllocator) { | 44 void operator delete(void* p, IFX_MEMAllocator* pAllocator) { |
| 45 pAllocator->Free(p); | 45 pAllocator->Free(p); |
| 46 } | 46 } |
| 47 void* operator new(size_t size, void* place) { return place; } | 47 void* operator new(size_t size, void* place) { return place; } |
| 48 void operator delete(void* p, void* place) {} | 48 void operator delete(void* p, void* place) {} |
| 49 }; | 49 }; |
| 50 |
| 50 #define FXTARGET_NewWith(__allocator__) new (__allocator__) | 51 #define FXTARGET_NewWith(__allocator__) new (__allocator__) |
| 51 #define FXTARGET_DeleteWith(__class__, __allocator__, pointer) \ | 52 #define FXTARGET_DeleteWith(__class__, __allocator__, pointer) \ |
| 52 { \ | 53 { \ |
| 53 (pointer)->~__class__(); \ | 54 (pointer)->~__class__(); \ |
| 54 (pointer)->operator delete((pointer), (__allocator__)); \ | 55 (pointer)->operator delete((pointer), (__allocator__)); \ |
| 55 } | 56 } |
| 56 | 57 |
| 57 #endif // XFA_SRC_FGAS_INCLUDE_FX_MEM_H_ | 58 #endif // XFA_SRC_FGAS_INCLUDE_FX_MEM_H_ |
| OLD | NEW |