diff options
| author |  Herb Derby <herb@google.com> | 2017-02-22 16:01:27 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-22 21:42:07 +0000 |
| commit | ca70b59d8c83dda0a31915ab824995cf49c830a1 (patch) | |
| tree | f190d400618a2dc88c70ac8082ccfc77878ed184 /src | |
| parent | aab68c56ef8fc88b0d1536f99aa1cc9ae7a0573a (diff) | |
Use uintptr_t for masking ptrs.
TBR=mtklein@google.com
Change-Id: I9f63087345f65547689dd77449cf6640aa886354
Reviewed-on: https://skia-review.googlesource.com/8890
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkArenaAlloc.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/SkArenaAlloc.cpp b/src/core/SkArenaAlloc.cpp index 7f907e669a..dee152ae20 100644 --- a/src/core/SkArenaAlloc.cpp +++ b/src/core/SkArenaAlloc.cpp @@ -129,8 +129,7 @@ char* SkArenaAlloc::allocObject(uint32_t size, uint32_t alignment) { } char* SkArenaAlloc::allocObjectWithFooter(uint32_t sizeIncludingFooter, uint32_t alignment) { - // Must be uint64 to mask 64-bit pointers properly. - uint64_t mask = alignment - 1; + uintptr_t mask = alignment - 1; restart: uint32_t skipOverhead = 0; |