Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Side by Side Diff: core/include/fxcrt/fx_memory.h

Issue 1134003007: Merge to XFA: Remove FX_NEW_VECTOR() macros. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_font/fpdf_font.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 _FX_MEMORY_H_ 7 #ifndef _FX_MEMORY_H_
8 #define _FX_MEMORY_H_ 8 #define _FX_MEMORY_H_
9 9
10 #include "fx_system.h" 10 #include "fx_system.h"
11 11
12 #ifdef __cplusplus 12 #ifdef __cplusplus
13 #include <new> 13 #include <new>
14 extern "C" { 14 extern "C" {
15 #endif 15 #endif
16 #define FX_Alloc(type, size) (type*)c alloc(size, sizeof(type)) 16 #define FX_Alloc(type, size) (type*)c alloc(size, sizeof(type))
17 #define FX_Realloc(type, ptr, size) (type*)r ealloc(ptr, sizeof(type) * (size)) 17 #define FX_Realloc(type, ptr, size) (type*)r ealloc(ptr, sizeof(type) * (size))
18 #define FX_AllocNL(type, size) FX_Alloc (type, size) 18 #define FX_AllocNL(type, size) FX_Alloc (type, size)
19 #define FX_ReallocNL(type, ptr, size) FX_Realloc(type, ptr, size) 19 #define FX_ReallocNL(type, ptr, size) FX_Realloc(type, ptr, size)
20 #define FX_Free(ptr) free(ptr) 20 #define FX_Free(ptr) free(ptr)
21 void* FXMEM_DefaultAlloc(size_t byte_size, int flags); 21 void* FXMEM_DefaultAlloc(size_t byte_size, int flags);
22 void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags); 22 void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
23 void FXMEM_DefaultFree(void* pointer, int flags); 23 void FXMEM_DefaultFree(void* pointer, int flags);
24 #ifdef __cplusplus 24 #ifdef __cplusplus
25 } 25 }
26 26
27 #define FX_NEW new 27 #define FX_NEW new
28 #define FX_NEW_VECTOR(Pointer, Class, Count) (Pointer = FX_NEW Class[Count])
29 #define FX_DELETE_VECTOR(Pointer, Class, Count) delete[] Pointer
30 28
31 class CFX_DestructObject 29 class CFX_DestructObject
32 { 30 {
33 public: 31 public:
34 32
35 virtual ~CFX_DestructObject() {} 33 virtual ~CFX_DestructObject() {}
36 }; 34 };
37 class CFX_GrowOnlyPool 35 class CFX_GrowOnlyPool
38 { 36 {
39 public: 37 public:
(...skipping 28 matching lines...) Expand all
68 66
69 void FreeAll(); 67 void FreeAll();
70 private: 68 private:
71 69
72 size_t m_TrunkSize; 70 size_t m_TrunkSize;
73 71
74 void* m_pFirstTrunk; 72 void* m_pFirstTrunk;
75 }; 73 };
76 #endif 74 #endif
77 #endif 75 #endif
OLDNEW
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_font/fpdf_font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698