| Index: include/core/SkTypes.h
|
| diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
|
| index bdd2e930ae61cc2d50e20b06dbb2461dad12ffee..0e9e2303493f40fa03e386d5a189cd50be4e6e51 100644
|
| --- a/include/core/SkTypes.h
|
| +++ b/include/core/SkTypes.h
|
| @@ -539,7 +539,7 @@ public:
|
| */
|
| void* reset(size_t size, OnShrink shrink = kAlloc_OnShrink, bool* didChangeAlloc = NULL) {
|
| if (size == fSize || (kReuse_OnShrink == shrink && size < fSize)) {
|
| - if (NULL != didChangeAlloc) {
|
| + if (didChangeAlloc) {
|
| *didChangeAlloc = false;
|
| }
|
| return fPtr;
|
| @@ -548,7 +548,7 @@ public:
|
| sk_free(fPtr);
|
| fPtr = size ? sk_malloc_throw(size) : NULL;
|
| fSize = size;
|
| - if (NULL != didChangeAlloc) {
|
| + if (didChangeAlloc) {
|
| *didChangeAlloc = true;
|
| }
|
|
|
| @@ -643,7 +643,7 @@ public:
|
| bool* didChangeAlloc = NULL) {
|
| size = (size < kSize) ? kSize : size;
|
| bool alloc = size != fSize && (SkAutoMalloc::kAlloc_OnShrink == shrink || size > fSize);
|
| - if (NULL != didChangeAlloc) {
|
| + if (didChangeAlloc) {
|
| *didChangeAlloc = alloc;
|
| }
|
| if (alloc) {
|
|
|