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

Side by Side Diff: src/core/SkVarAlloc.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/core/SkValidatingReadBuffer.cpp ('k') | src/core/SkVertState.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkVarAlloc.h" 8 #include "SkVarAlloc.h"
9 9
10 // We use non-standard malloc diagnostic methods to make sure our allocations ar e sized well. 10 // We use non-standard malloc diagnostic methods to make sure our allocations ar e sized well.
(...skipping 10 matching lines...) Expand all
21 static Block* Alloc(Block* prev, size_t size, unsigned flags) { 21 static Block* Alloc(Block* prev, size_t size, unsigned flags) {
22 SkASSERT(size >= sizeof(Block)); 22 SkASSERT(size >= sizeof(Block));
23 Block* b = (Block*)sk_malloc_flags(size, flags); 23 Block* b = (Block*)sk_malloc_flags(size, flags);
24 b->prev = prev; 24 b->prev = prev;
25 return b; 25 return b;
26 } 26 }
27 }; 27 };
28 28
29 SkVarAlloc::SkVarAlloc(size_t minLgSize) 29 SkVarAlloc::SkVarAlloc(size_t minLgSize)
30 : fBytesAllocated(0) 30 : fBytesAllocated(0)
31 , fByte(NULL) 31 , fByte(nullptr)
32 , fRemaining(0) 32 , fRemaining(0)
33 , fLgSize(minLgSize) 33 , fLgSize(minLgSize)
34 , fBlock(NULL) {} 34 , fBlock(nullptr) {}
35 35
36 SkVarAlloc::SkVarAlloc(size_t minLgSize, char* storage, size_t len) 36 SkVarAlloc::SkVarAlloc(size_t minLgSize, char* storage, size_t len)
37 : fBytesAllocated(0) 37 : fBytesAllocated(0)
38 , fByte(storage) 38 , fByte(storage)
39 , fRemaining(len) 39 , fRemaining(len)
40 , fLgSize(minLgSize) 40 , fLgSize(minLgSize)
41 , fBlock(NULL) {} 41 , fBlock(nullptr) {}
42 42
43 SkVarAlloc::~SkVarAlloc() { 43 SkVarAlloc::~SkVarAlloc() {
44 Block* b = fBlock; 44 Block* b = fBlock;
45 while (b) { 45 while (b) {
46 Block* prev = b->prev; 46 Block* prev = b->prev;
47 sk_free(b); 47 sk_free(b);
48 b = prev; 48 b = prev;
49 } 49 }
50 } 50 }
51 51
52 void SkVarAlloc::makeSpace(size_t bytes, unsigned flags) { 52 void SkVarAlloc::makeSpace(size_t bytes, unsigned flags) {
53 SkASSERT(SkIsAlignPtr(bytes)); 53 SkASSERT(SkIsAlignPtr(bytes));
54 54
55 size_t alloc = 1<<fLgSize++; 55 size_t alloc = 1<<fLgSize++;
56 while (alloc < bytes + sizeof(Block)) { 56 while (alloc < bytes + sizeof(Block)) {
57 alloc *= 2; 57 alloc *= 2;
58 } 58 }
59 fBytesAllocated += alloc; 59 fBytesAllocated += alloc;
60 fBlock = Block::Alloc(fBlock, alloc, flags); 60 fBlock = Block::Alloc(fBlock, alloc, flags);
61 fByte = fBlock->data(); 61 fByte = fBlock->data();
62 fRemaining = alloc - sizeof(Block); 62 fRemaining = alloc - sizeof(Block);
63 63
64 #if defined(SK_BUILD_FOR_MAC) 64 #if defined(SK_BUILD_FOR_MAC)
65 SkASSERT(alloc == malloc_good_size(alloc)); 65 SkASSERT(alloc == malloc_good_size(alloc));
66 #elif defined(SK_BUILD_FOR_UNIX) && !defined(__UCLIBC__) 66 #elif defined(SK_BUILD_FOR_UNIX) && !defined(__UCLIBC__)
67 // TODO(mtklein): tune so we can assert something like this 67 // TODO(mtklein): tune so we can assert something like this
68 //SkASSERT(alloc == malloc_usable_size(fBlock)); 68 //SkASSERT(alloc == malloc_usable_size(fBlock));
69 #endif 69 #endif
70 } 70 }
OLDNEW
« no previous file with comments | « src/core/SkValidatingReadBuffer.cpp ('k') | src/core/SkVertState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698