commit 25272096bdc0ceed8de49aa9310feb7cc3ea3744
author Herb Derby <herb@google.com> Fri Feb 17 14:05:49 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 17 19:38:56 2017 +0000
tree 97247256b330ca4773780479f4a40e0b61a54f3f
parent 561d1f8153c591dac670148a574a7638f3fe8c2d

Make mask uintptr_t when calculating alignment.

A suggestion from from the code review on cl/7614.

TBR=mtklein@google.com

Change-Id: Icfbe08bfe63ac1e21ed56481dc5251c2af5bb96a
Reviewed-on: https://skia-review.googlesource.com/8674
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/core/SkArenaAlloc.cpp

diff --git a/src/core/SkArenaAlloc.cpp b/src/core/SkArenaAlloc.cpp
index 4146c4f..7f907e6 100644
--- a/src/core/SkArenaAlloc.cpp
+++ b/src/core/SkArenaAlloc.cpp
@@ -119,8 +119,7 @@
 }
 
 char* SkArenaAlloc::allocObject(uint32_t size, uint32_t alignment) {
-    // Must be uint64 to mask 64-bit pointers properly.
-    uint64_t mask = alignment - 1;
+    uintptr_t mask = alignment - 1;
     char* objStart = (char*)((uintptr_t)(fCursor + mask) & ~mask);
     if ((ptrdiff_t)size > fEnd - objStart) {
         this->ensureSpace(size, alignment);