OLD | NEW |
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 struct SkVarAlloc::Block { | 10 struct SkVarAlloc::Block { |
(...skipping 27 matching lines...) Expand all Loading... |
38 while (b) { | 38 while (b) { |
39 Block* prev = b->prev; | 39 Block* prev = b->prev; |
40 sk_free(b); | 40 sk_free(b); |
41 b = prev; | 41 b = prev; |
42 } | 42 } |
43 } | 43 } |
44 | 44 |
45 void SkVarAlloc::makeSpace(size_t bytes) { | 45 void SkVarAlloc::makeSpace(size_t bytes) { |
46 SkASSERT(SkIsAlignPtr(bytes)); | 46 SkASSERT(SkIsAlignPtr(bytes)); |
47 | 47 |
48 size_t alloc = 1<<fLgSize++; | 48 size_t alloc = static_cast<size_t>(1)<<fLgSize++; |
49 while (alloc < bytes + sizeof(Block)) { | 49 while (alloc < bytes + sizeof(Block)) { |
50 alloc *= 2; | 50 alloc *= 2; |
51 } | 51 } |
52 fBytesAllocated += alloc; | 52 fBytesAllocated += alloc; |
53 fBlock = Block::Alloc(fBlock, alloc); | 53 fBlock = Block::Alloc(fBlock, alloc); |
54 fByte = fBlock->data(); | 54 fByte = fBlock->data(); |
55 fRemaining = alloc - sizeof(Block); | 55 fRemaining = alloc - sizeof(Block); |
56 } | 56 } |
OLD | NEW |