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

Side by Side Diff: core/src/fxcrt/fx_basic_memmgr.cpp

Issue 1427633010: Fix relative includes within core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 5 years, 1 month 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 | « core/src/fxcrt/fx_basic_maps.cpp ('k') | core/src/fxcrt/fx_basic_memmgr_unittest.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 #include <stdlib.h> // For abort(). 7 #include <stdlib.h> // For abort().
8 #include "../../include/fxcrt/fx_memory.h" 8
9 #include "core/include/fxcrt/fx_memory.h"
9 10
10 void* FXMEM_DefaultAlloc(size_t byte_size, int flags) { 11 void* FXMEM_DefaultAlloc(size_t byte_size, int flags) {
11 return (void*)malloc(byte_size); 12 return (void*)malloc(byte_size);
12 } 13 }
13 void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags) { 14 void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags) {
14 return realloc(pointer, new_size); 15 return realloc(pointer, new_size);
15 } 16 }
16 void FXMEM_DefaultFree(void* pointer, int flags) { 17 void FXMEM_DefaultFree(void* pointer, int flags) {
17 free(pointer); 18 free(pointer);
18 } 19 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 58 }
58 size_t alloc_size = size > m_TrunkSize ? size : m_TrunkSize; 59 size_t alloc_size = size > m_TrunkSize ? size : m_TrunkSize;
59 pTrunk = (_FX_GrowOnlyTrunk*)FX_Alloc(uint8_t, 60 pTrunk = (_FX_GrowOnlyTrunk*)FX_Alloc(uint8_t,
60 sizeof(_FX_GrowOnlyTrunk) + alloc_size); 61 sizeof(_FX_GrowOnlyTrunk) + alloc_size);
61 pTrunk->m_Size = alloc_size; 62 pTrunk->m_Size = alloc_size;
62 pTrunk->m_Allocated = size; 63 pTrunk->m_Allocated = size;
63 pTrunk->m_pNext = (_FX_GrowOnlyTrunk*)m_pFirstTrunk; 64 pTrunk->m_pNext = (_FX_GrowOnlyTrunk*)m_pFirstTrunk;
64 m_pFirstTrunk = pTrunk; 65 m_pFirstTrunk = pTrunk;
65 return pTrunk + 1; 66 return pTrunk + 1;
66 } 67 }
OLDNEW
« no previous file with comments | « core/src/fxcrt/fx_basic_maps.cpp ('k') | core/src/fxcrt/fx_basic_memmgr_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698