| Index: src/core/SkRecordPattern.h
|
| diff --git a/src/core/SkRecordPattern.h b/src/core/SkRecordPattern.h
|
| index 174665afc3b287935800b042ef462a4c76adae4a..ecc61b3aaa1cabeab38889fad5989635ce5de74b 100644
|
| --- a/src/core/SkRecordPattern.h
|
| +++ b/src/core/SkRecordPattern.h
|
| @@ -19,7 +19,7 @@ namespace SkRecords {
|
| template <typename T>
|
| class Is {
|
| public:
|
| - Is() : fPtr(NULL) {}
|
| + Is() : fPtr(nullptr) {}
|
|
|
| typedef T type;
|
| type* get() { return fPtr; }
|
| @@ -31,7 +31,7 @@ public:
|
|
|
| template <typename U>
|
| bool operator()(U*) {
|
| - fPtr = NULL;
|
| + fPtr = nullptr;
|
| return false;
|
| }
|
|
|
| @@ -43,7 +43,7 @@ private:
|
| class IsDraw {
|
| SK_CREATE_MEMBER_DETECTOR(paint);
|
| public:
|
| - IsDraw() : fPaint(NULL) {}
|
| + IsDraw() : fPaint(nullptr) {}
|
|
|
| typedef SkPaint type;
|
| type* get() { return fPaint; }
|
| @@ -56,13 +56,13 @@ public:
|
|
|
| template <typename T>
|
| SK_WHEN(!HasMember_paint<T>, bool) operator()(T*) {
|
| - fPaint = NULL;
|
| + fPaint = nullptr;
|
| return false;
|
| }
|
|
|
| // SaveLayer has an SkPaint named paint, but it's not a draw.
|
| bool operator()(SaveLayer*) {
|
| - fPaint = NULL;
|
| + fPaint = nullptr;
|
| return false;
|
| }
|
|
|
|
|