| Index: src/gpu/GrClipMaskCache.h
|
| diff --git a/src/gpu/GrClipMaskCache.h b/src/gpu/GrClipMaskCache.h
|
| index edba54d372368951bfe1b2d8e32b7ba1d4eb3734..56b0e978dd26ae024e12844fad4c960eb9584f7c 100644
|
| --- a/src/gpu/GrClipMaskCache.h
|
| +++ b/src/gpu/GrClipMaskCache.h
|
| @@ -92,7 +92,7 @@ public:
|
|
|
| if (fStack.empty()) {
|
| SkASSERT(false);
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
|
| @@ -104,7 +104,7 @@ public:
|
|
|
| if (fStack.empty()) {
|
| SkASSERT(false);
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
|
| @@ -135,7 +135,7 @@ public:
|
|
|
| GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
|
|
|
| - if (NULL == back->fLastMask) {
|
| + if (nullptr == back->fLastMask) {
|
| return -1;
|
| }
|
|
|
| @@ -151,7 +151,7 @@ public:
|
|
|
| GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
|
|
|
| - if (NULL == back->fLastMask) {
|
| + if (nullptr == back->fLastMask) {
|
| return -1;
|
| }
|
|
|
| @@ -175,7 +175,7 @@ public:
|
| void purgeResources() {
|
| SkDeque::F2BIter iter(fStack);
|
| for (GrClipStackFrame* frame = (GrClipStackFrame*) iter.next();
|
| - frame != NULL;
|
| + frame != nullptr;
|
| frame = (GrClipStackFrame*) iter.next()) {
|
| frame->reset();
|
| }
|
| @@ -208,7 +208,7 @@ private:
|
|
|
| GrSurfaceDesc desc;
|
|
|
| - fLastMask.reset(NULL);
|
| + fLastMask.reset(nullptr);
|
| fLastBound.setEmpty();
|
| }
|
|
|
|
|