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

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

Issue 1171733003: Remove typdefs for pointer types in fx_system.h (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual fixes. Created 5 years, 6 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
« no previous file with comments | « core/src/fxcrt/fx_basic_maps.cpp ('k') | core/src/fxcrt/fx_basic_utf.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 #include "../../include/fxcrt/fx_memory.h"
9 9
10 void* FXMEM_DefaultAlloc(size_t byte_size, int flags) 10 void* FXMEM_DefaultAlloc(size_t byte_size, int flags)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 pTrunk = pNext; 49 pTrunk = pNext;
50 } 50 }
51 m_pFirstTrunk = NULL; 51 m_pFirstTrunk = NULL;
52 } 52 }
53 void* CFX_GrowOnlyPool::Alloc(size_t size) 53 void* CFX_GrowOnlyPool::Alloc(size_t size)
54 { 54 {
55 size = (size + 3) / 4 * 4; 55 size = (size + 3) / 4 * 4;
56 _FX_GrowOnlyTrunk* pTrunk = (_FX_GrowOnlyTrunk*)m_pFirstTrunk; 56 _FX_GrowOnlyTrunk* pTrunk = (_FX_GrowOnlyTrunk*)m_pFirstTrunk;
57 while (pTrunk) { 57 while (pTrunk) {
58 if (pTrunk->m_Size - pTrunk->m_Allocated >= size) { 58 if (pTrunk->m_Size - pTrunk->m_Allocated >= size) {
59 void* p = (FX_LPBYTE)(pTrunk + 1) + pTrunk->m_Allocated; 59 void* p = (uint8_t*)(pTrunk + 1) + pTrunk->m_Allocated;
60 pTrunk->m_Allocated += size; 60 pTrunk->m_Allocated += size;
61 return p; 61 return p;
62 } 62 }
63 pTrunk = pTrunk->m_pNext; 63 pTrunk = pTrunk->m_pNext;
64 } 64 }
65 size_t alloc_size = size > m_TrunkSize ? size : m_TrunkSize; 65 size_t alloc_size = size > m_TrunkSize ? size : m_TrunkSize;
66 pTrunk = (_FX_GrowOnlyTrunk*)FX_Alloc(uint8_t, sizeof(_FX_GrowOnlyTrunk) + a lloc_size); 66 pTrunk = (_FX_GrowOnlyTrunk*)FX_Alloc(uint8_t, sizeof(_FX_GrowOnlyTrunk) + a lloc_size);
67 pTrunk->m_Size = alloc_size; 67 pTrunk->m_Size = alloc_size;
68 pTrunk->m_Allocated = size; 68 pTrunk->m_Allocated = size;
69 pTrunk->m_pNext = (_FX_GrowOnlyTrunk*)m_pFirstTrunk; 69 pTrunk->m_pNext = (_FX_GrowOnlyTrunk*)m_pFirstTrunk;
70 m_pFirstTrunk = pTrunk; 70 m_pFirstTrunk = pTrunk;
71 return pTrunk + 1; 71 return pTrunk + 1;
72 } 72 }
OLDNEW
« no previous file with comments | « core/src/fxcrt/fx_basic_maps.cpp ('k') | core/src/fxcrt/fx_basic_utf.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698