From a9deea931ed7c7526bb32e30c54d91763f8026e0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 25 Apr 2017 10:37:47 -0700 Subject: Rename fx_basic_memmgr.cpp to fx_memory.cpp to match .h naming Change-Id: I769d7f2c52b0a0db36be6145bfb626c126a58be9 Reviewed-on: https://pdfium-review.googlesource.com/4480 Commit-Queue: Tom Sepez Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fxcrt/fx_basic_memmgr.cpp | 46 ------------------------------------------ 1 file changed, 46 deletions(-) delete mode 100644 core/fxcrt/fx_basic_memmgr.cpp (limited to 'core/fxcrt/fx_basic_memmgr.cpp') diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_basic_memmgr.cpp deleted file mode 100644 index 75bc2bc1f1..0000000000 --- a/core/fxcrt/fx_basic_memmgr.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// 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 - -#include // For abort(). - -#include "core/fxcrt/fx_memory.h" - -pdfium::base::PartitionAllocatorGeneric gArrayBufferPartitionAllocator; -pdfium::base::PartitionAllocatorGeneric gStringPartitionAllocator; - -void FXMEM_InitalizePartitionAlloc() { - static bool s_gPartitionAllocatorsInitialized = false; - if (!s_gPartitionAllocatorsInitialized) { - pdfium::base::PartitionAllocGlobalInit(FX_OutOfMemoryTerminate); - gArrayBufferPartitionAllocator.init(); - gStringPartitionAllocator.init(); - s_gPartitionAllocatorsInitialized = true; - } -} - -void* FXMEM_DefaultAlloc(size_t byte_size, int flags) { - return (void*)malloc(byte_size); -} - -void* FXMEM_DefaultCalloc(size_t num_elems, size_t byte_size) { - return calloc(num_elems, byte_size); -} - -void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags) { - return realloc(pointer, new_size); -} - -void FXMEM_DefaultFree(void* pointer, int flags) { - free(pointer); -} - -NEVER_INLINE void FX_OutOfMemoryTerminate() { - // Termimate cleanly if we can, else crash at a specific address (0xbd). - abort(); -#ifndef _WIN32 - reinterpret_cast(0xbd)(); -#endif -} -- cgit v1.2.3