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

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

Issue 722293003: Cap SkVarAlloc's desired block at 64K. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
« src/core/SkVarAlloc.h ('K') | « src/core/SkVarAlloc.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "SkVarAlloc.h" 1 #include "SkVarAlloc.h"
2 2
3 // We use non-standard malloc diagnostic methods to make sure our allocations ar e sized well. 3 // We use non-standard malloc diagnostic methods to make sure our allocations ar e sized well.
4 #if defined(SK_BUILD_FOR_MAC) 4 #if defined(SK_BUILD_FOR_MAC)
5 #include <malloc/malloc.h> 5 #include <malloc/malloc.h>
6 #elif defined(SK_BUILD_FOR_LINUX) 6 #elif defined(SK_BUILD_FOR_LINUX)
7 #include <malloc.h> 7 #include <malloc.h>
8 #endif 8 #endif
9 9
10 struct SkVarAlloc::Block { 10 struct SkVarAlloc::Block {
(...skipping 19 matching lines...) Expand all
30 while (b) { 30 while (b) {
31 Block* prev = b->prev; 31 Block* prev = b->prev;
32 sk_free(b); 32 sk_free(b);
33 b = prev; 33 b = prev;
34 } 34 }
35 } 35 }
36 36
37 void SkVarAlloc::makeSpace(size_t bytes, unsigned flags) { 37 void SkVarAlloc::makeSpace(size_t bytes, unsigned flags) {
38 SkASSERT(SkIsAlignPtr(bytes)); 38 SkASSERT(SkIsAlignPtr(bytes));
39 39
40 size_t alloc = 1<<(fLgMinSize++); 40 size_t alloc = 1<<fLgMinSize;
41 while (alloc < bytes + sizeof(Block)) { 41 while (alloc < bytes + sizeof(Block)) {
42 alloc *= 2; 42 alloc *= 2;
43 } 43 }
44 fBlock = Block::Alloc(fBlock, alloc, flags); 44 fBlock = Block::Alloc(fBlock, alloc, flags);
45 fByte = fBlock->data(); 45 fByte = fBlock->data();
46 fRemaining = alloc - sizeof(Block); 46 fRemaining = alloc - sizeof(Block);
47 47
48 if (fLgMinSize < 16) {
reed1 2014/11/13 21:40:07 please add comment + possible a #define with a com
49 fLgMinSize++;
50 }
51
48 #if defined(SK_BUILD_FOR_MAC) 52 #if defined(SK_BUILD_FOR_MAC)
49 SkASSERT(alloc == malloc_good_size(alloc)); 53 SkASSERT(alloc == malloc_good_size(alloc));
50 #elif defined(SK_BUILD_FOR_LINUX) 54 #elif defined(SK_BUILD_FOR_LINUX)
51 SkASSERT(alloc == malloc_usable_size(fByte - sizeof(Block))); 55 SkASSERT(alloc == malloc_usable_size(fByte - sizeof(Block)));
52 #endif 56 #endif
53 } 57 }
OLDNEW
« src/core/SkVarAlloc.h ('K') | « src/core/SkVarAlloc.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698