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

Unified Diff: core/include/fxcrt/fx_memory.h

Issue 453133004: clang-format all code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: core/include/fxcrt/fx_memory.h
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index cb71c04fcaf9e72789fed460d44664e692e9c890..2f5f9ec0c97868bda66188a7ee5151b837d36817 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -12,123 +12,90 @@
#ifdef __cplusplus
extern "C" {
#endif
-#define FX_Alloc(type, size) (type*)calloc(size, sizeof(type))
-#define FX_Realloc(type, ptr, size) (type*)realloc(ptr, sizeof(type) * (size))
-#define FX_AllocNL(type, size) FX_Alloc(type, size)
-#define FX_ReallocNL(type, ptr, size) FX_Realloc(type, ptr, size)
-#define FX_Free(ptr) free(ptr)
-void* FXMEM_DefaultAlloc(size_t byte_size, int flags);
-void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
-void FXMEM_DefaultFree(void* pointer, int flags);
+#define FX_Alloc(type, size) (type*) calloc(size, sizeof(type))
+#define FX_Realloc(type, ptr, size) (type*) realloc(ptr, sizeof(type) * (size))
+#define FX_AllocNL(type, size) FX_Alloc(type, size)
+#define FX_ReallocNL(type, ptr, size) FX_Realloc(type, ptr, size)
+#define FX_Free(ptr) free(ptr)
+void* FXMEM_DefaultAlloc(size_t byte_size, int flags);
+void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
+void FXMEM_DefaultFree(void* pointer, int flags);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
-class CFX_Object
-{
-public:
- void* operator new (size_t size, FX_LPCSTR file, int line)
- {
- return malloc(size);
- }
- void operator delete (void* p, FX_LPCSTR file, int line)
- {
- free(p);
- }
- void* operator new (size_t size)
- {
- return malloc(size);
- }
- void operator delete (void* p)
- {
- free(p);
- }
- void* operator new[] (size_t size, FX_LPCSTR file, int line)
- {
- return malloc(size);
- }
- void operator delete[] (void* p, FX_LPCSTR file, int line)
- {
- free(p);
- }
- void* operator new[] (size_t size)
- {
- return malloc(size);
- }
- void operator delete[] (void* p)
- {
- free(p);
- }
- void* operator new (size_t, void* buf)
- {
- return buf;
- }
- void operator delete (void*, void*) {}
+class CFX_Object {
+ public:
+ void* operator new(size_t size, FX_LPCSTR file, int line) {
+ return malloc(size);
+ }
+ void operator delete(void* p, FX_LPCSTR file, int line) { free(p); }
+ void* operator new(size_t size) { return malloc(size); }
+ void operator delete(void* p) { free(p); }
+ void* operator new
+ [](size_t size, FX_LPCSTR file, int line) { return malloc(size); } void
+ operator delete [](void* p, FX_LPCSTR file, int line) { free(p); } void*
+ operator new [](size_t size) { return malloc(size); } void
+ operator delete [](void* p) { free(p); } void*
+ operator new(size_t, void* buf) {
+ return buf;
+ }
+ void operator delete(void*, void*) {}
};
#endif
#ifdef __cplusplus
#if defined(_DEBUG)
-#define FX_NEW new(__FILE__, __LINE__)
+#define FX_NEW new (__FILE__, __LINE__)
#else
#define FX_NEW new
#endif
#define FX_NEW_VECTOR(Pointer, Class, Count) \
- { \
- Pointer = FX_Alloc(Class, Count); \
- if (Pointer) { \
- for (int i = 0; i < (Count); i ++) new (Pointer + i) Class; \
- } \
- }
+ { \
+ Pointer = FX_Alloc(Class, Count); \
+ if (Pointer) { \
+ for (int i = 0; i < (Count); i++) \
+ new (Pointer + i) Class; \
+ } \
+ }
#define FX_DELETE_VECTOR(Pointer, Class, Count) \
- { \
- for (int i = 0; i < (Count); i ++) Pointer[i].~Class(); \
- FX_Free(Pointer); \
- }
-class CFX_DestructObject : public CFX_Object
-{
-public:
-
- virtual ~CFX_DestructObject() {}
+ { \
+ for (int i = 0; i < (Count); i++) \
+ Pointer[i]. ~Class(); \
+ FX_Free(Pointer); \
+ }
+class CFX_DestructObject : public CFX_Object {
+ public:
+ virtual ~CFX_DestructObject() {}
};
-class CFX_GrowOnlyPool : public CFX_Object
-{
-public:
-
- CFX_GrowOnlyPool(size_t trunk_size = 16384);
+class CFX_GrowOnlyPool : public CFX_Object {
+ public:
+ CFX_GrowOnlyPool(size_t trunk_size = 16384);
- ~CFX_GrowOnlyPool();
+ ~CFX_GrowOnlyPool();
- void SetTrunkSize(size_t trunk_size)
- {
- m_TrunkSize = trunk_size;
- }
+ void SetTrunkSize(size_t trunk_size) { m_TrunkSize = trunk_size; }
- void* AllocDebug(size_t size, FX_LPCSTR file, int line)
- {
- return Alloc(size);
- }
+ void* AllocDebug(size_t size, FX_LPCSTR file, int line) {
+ return Alloc(size);
+ }
- void* Alloc(size_t size);
+ void* Alloc(size_t size);
- void* ReallocDebug(void* p, size_t new_size, FX_LPCSTR file, int line)
- {
- return NULL;
- }
+ void* ReallocDebug(void* p, size_t new_size, FX_LPCSTR file, int line) {
+ return NULL;
+ }
- void* Realloc(void* p, size_t new_size)
- {
- return NULL;
- }
+ void* Realloc(void* p, size_t new_size) { return NULL; }
- void Free(void*) {}
+ void Free(void*) {}
- void FreeAll();
-private:
+ void FreeAll();
- size_t m_TrunkSize;
+ private:
+ size_t m_TrunkSize;
- void* m_pFirstTrunk;
+ void* m_pFirstTrunk;
};
#endif
#endif

Powered by Google App Engine
This is Rietveld 408576698