From 96fcdcc219d2a0d3579719b84b28bede76efba64 Mon Sep 17 00:00:00 2001 From: halcanary Date: Thu, 27 Aug 2015 07:41:13 -0700 Subject: Style Change: NULL->nullptr DOCS_PREVIEW= https://skia.org/?cl=1316233002 Review URL: https://codereview.chromium.org/1316233002 --- samplecode/SampleClipDrawMatch.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'samplecode/SampleClipDrawMatch.cpp') diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp index c79c87239d..502f34946b 100644 --- a/samplecode/SampleClipDrawMatch.cpp +++ b/samplecode/SampleClipDrawMatch.cpp @@ -141,17 +141,17 @@ protected: SkUnichar uni; if (SampleCode::CharQ(*evt, &uni)) { switch (uni) { - case '1': fGeom = kRect_Geometry; this->inval(NULL); return true; - case '2': fGeom = kRRect_Geometry; this->inval(NULL); return true; - case '3': fGeom = kCircle_Geometry; this->inval(NULL); return true; - case '4': fGeom = kConvexPath_Geometry; this->inval(NULL); return true; - case '5': fGeom = kConcavePath_Geometry; this->inval(NULL); return true; - case '6': fGeom = kRectAndRect_Geometry; this->inval(NULL); return true; - case '7': fGeom = kRectAndRRect_Geometry; this->inval(NULL); return true; - case '8': fGeom = kRectAndConvex_Geometry; this->inval(NULL); return true; - case '9': fGeom = kRectAndConcave_Geometry; this->inval(NULL); return true; - case 'f': fSign = -fSign; this->inval(NULL); return true; - case 't': fClipFirst = !fClipFirst; this->inval(NULL); return true; + case '1': fGeom = kRect_Geometry; this->inval(nullptr); return true; + case '2': fGeom = kRRect_Geometry; this->inval(nullptr); return true; + case '3': fGeom = kCircle_Geometry; this->inval(nullptr); return true; + case '4': fGeom = kConvexPath_Geometry; this->inval(nullptr); return true; + case '5': fGeom = kConcavePath_Geometry; this->inval(nullptr); return true; + case '6': fGeom = kRectAndRect_Geometry; this->inval(nullptr); return true; + case '7': fGeom = kRectAndRRect_Geometry; this->inval(nullptr); return true; + case '8': fGeom = kRectAndConvex_Geometry; this->inval(nullptr); return true; + case '9': fGeom = kRectAndConcave_Geometry; this->inval(nullptr); return true; + case 'f': fSign = -fSign; this->inval(nullptr); return true; + case 't': fClipFirst = !fClipFirst; this->inval(nullptr); return true; default: break; } } @@ -240,7 +240,7 @@ protected: this->drawGeometry(canvas, offset, false); canvas->restoreToCount(saveCount); - this->inval(NULL); + this->inval(nullptr); } private: -- cgit v1.2.3