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

Side by Side Diff: xfa/src/fgas/include/fx_mem.h

Issue 1570743002: XFA: Remove many relative includes in xfa/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 4 years, 11 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
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 7 #ifndef _FX_MEMORY
Tom Sepez 2016/01/08 18:47:18 This conflicts with other FX_MEMORY symbols if we
Lei Zhang 2016/01/08 23:21:33 There's no conflict. Fix can happen in another CL.
8 #define _FX_MEMORY 8 #define _FX_MEMORY
9 9
10 #include "../../../../core/include/fxcrt/fx_memory.h" // For FX_Alloc(). 10 #include "core/include/fxcrt/fx_memory.h" // For FX_Alloc().
11 11
12 class IFX_MEMAllocator; 12 class IFX_MEMAllocator;
13 class CFX_Target; 13 class CFX_Target;
14 enum FX_ALLOCTYPE { 14 enum FX_ALLOCTYPE {
15 FX_ALLOCTYPE_Default = 0, 15 FX_ALLOCTYPE_Default = 0,
16 FX_ALLOCTYPE_Static, 16 FX_ALLOCTYPE_Static,
17 FX_ALLOCTYPE_Fixed, 17 FX_ALLOCTYPE_Fixed,
18 FX_ALLOCTYPE_Dynamic, 18 FX_ALLOCTYPE_Dynamic,
19 }; 19 };
20 20
(...skipping 26 matching lines...) Expand all
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 #define FXTARGET_NewWith(__allocator__) new (__allocator__) 50 #define FXTARGET_NewWith(__allocator__) new (__allocator__)
51 #define FXTARGET_DeleteWith(__class__, __allocator__, pointer) \ 51 #define FXTARGET_DeleteWith(__class__, __allocator__, pointer) \
52 { \ 52 { \
53 (pointer)->~__class__(); \ 53 (pointer)->~__class__(); \
54 (pointer)->operator delete((pointer), (__allocator__)); \ 54 (pointer)->operator delete((pointer), (__allocator__)); \
55 } 55 }
56 #endif 56 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698