From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Wed, 23 Mar 2016 15:41:39 -0400
Subject: Move core/include/fxcrt to core/fxcrt/include.

This CL moves the fxcrt code into the core/fxcrt directory. The only exception
was fx_bidi.h which was moved into core/fxcrt as it is not used outside of
core/.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1825953002 .
---
 core/fxcrt/include/fx_memory.h | 84 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 core/fxcrt/include/fx_memory.h

(limited to 'core/fxcrt/include/fx_memory.h')

diff --git a/core/fxcrt/include/fx_memory.h b/core/fxcrt/include/fx_memory.h
new file mode 100644
index 0000000000..c3dafc8d5e
--- /dev/null
+++ b/core/fxcrt/include/fx_memory.h
@@ -0,0 +1,84 @@
+// 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
+
+#ifndef CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+#define CORE_FXCRT_INCLUDE_FX_MEMORY_H_
+
+#include "core/fxcrt/include/fx_system.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// For external C libraries to malloc through PDFium. These may return NULL.
+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
+}  // extern "C"
+
+#include <stdlib.h>
+#include <limits>
+#include <new>
+
+NEVER_INLINE void FX_OutOfMemoryTerminate();
+
+inline void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size) {
+  if (num_members < std::numeric_limits<size_t>::max() / member_size) {
+    return realloc(ptr, num_members * member_size);
+  }
+  return nullptr;
+}
+
+inline void* FX_AllocOrDie(size_t num_members, size_t member_size) {
+  // TODO(tsepez): See if we can avoid the implicit memset(0).
+  if (void* result = calloc(num_members, member_size)) {
+    return result;
+  }
+  FX_OutOfMemoryTerminate();  // Never returns.
+  return nullptr;             // Suppress compiler warning.
+}
+
+inline void* FX_AllocOrDie2D(size_t w, size_t h, size_t member_size) {
+  if (w < std::numeric_limits<size_t>::max() / h) {
+    return FX_AllocOrDie(w * h, member_size);
+  }
+  FX_OutOfMemoryTerminate();  // Never returns.
+  return nullptr;             // Suppress compiler warning.
+}
+
+inline void* FX_ReallocOrDie(void* ptr,
+                             size_t num_members,
+                             size_t member_size) {
+  if (void* result = FX_SafeRealloc(ptr, num_members, member_size)) {
+    return result;
+  }
+  FX_OutOfMemoryTerminate();  // Never returns.
+  return nullptr;             // Suppress compiler warning.
+}
+
+// Never returns NULL.
+#define FX_Alloc(type, size) (type*) FX_AllocOrDie(size, sizeof(type))
+#define FX_Alloc2D(type, w, h) (type*) FX_AllocOrDie2D(w, h, sizeof(type))
+#define FX_Realloc(type, ptr, size) \
+  (type*) FX_ReallocOrDie(ptr, size, sizeof(type))
+
+// May return NULL.
+#define FX_TryAlloc(type, size) (type*) calloc(size, sizeof(type))
+#define FX_TryRealloc(type, ptr, size) \
+  (type*) FX_SafeRealloc(ptr, size, sizeof(type))
+
+#define FX_Free(ptr) free(ptr)
+
+class CFX_DestructObject {
+ public:
+  virtual ~CFX_DestructObject() {}
+};
+
+#endif  // __cplusplus
+
+#endif  // CORE_FXCRT_INCLUDE_FX_MEMORY_H_
-- 
cgit v1.2.3